[sldev-commits] r2230 - in projects/2009/http-texture: . doc indra/llcommon indra/llimage indra/newview indra/newview/English.lproj indra/newview/installers/windows indra/newview/res indra/newview/skins/default/xui/en-us indra/newview/skins/default/xui/es indra/newview/skins/default/xui/ko indra/newview/skins/default/xui/pl indra/newview/skins/default/xui/pt indra/newview/skins/default/xui/ru indra/newview/skins/default/xui/uk indra/newview/skins/default/xui/zh

merov.linden at svn.secondlife.com merov.linden at svn.secondlife.com
Thu May 7 17:30:23 PDT 2009


Author: merov.linden
Date: 2009-05-07 19:30:22 -0500 (Thu, 07 May 2009)
New Revision: 2230

Added:
   projects/2009/http-texture/indra/newview/lltexturestats.cpp
   projects/2009/http-texture/indra/newview/lltexturestats.h
Modified:
   projects/2009/http-texture/
   projects/2009/http-texture/doc/asset_urls.txt
   projects/2009/http-texture/doc/contributions.txt
   projects/2009/http-texture/indra/llcommon/llversionserver.h
   projects/2009/http-texture/indra/llcommon/llversionviewer.h
   projects/2009/http-texture/indra/llimage/CMakeLists.txt
   projects/2009/http-texture/indra/llimage/llimageworker.cpp
   projects/2009/http-texture/indra/llimage/llimageworker.h
   projects/2009/http-texture/indra/newview/CMakeLists.txt
   projects/2009/http-texture/indra/newview/English.lproj/InfoPlist.strings
   projects/2009/http-texture/indra/newview/Info-SecondLife.plist
   projects/2009/http-texture/indra/newview/installers/windows/installer_template.nsi
   projects/2009/http-texture/indra/newview/llagent.cpp
   projects/2009/http-texture/indra/newview/llappviewer.cpp
   projects/2009/http-texture/indra/newview/llfloatersnapshot.cpp
   projects/2009/http-texture/indra/newview/llpanelclassified.cpp
   projects/2009/http-texture/indra/newview/llviewermessage.cpp
   projects/2009/http-texture/indra/newview/llviewerstats.cpp
   projects/2009/http-texture/indra/newview/llviewerstats.h
   projects/2009/http-texture/indra/newview/res/viewerRes.rc
   projects/2009/http-texture/indra/newview/skins/default/xui/en-us/floater_preview_existing_landmark.xml
   projects/2009/http-texture/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml
   projects/2009/http-texture/indra/newview/skins/default/xui/en-us/panel_classified.xml
   projects/2009/http-texture/indra/newview/skins/default/xui/en-us/panel_group_general.xml
   projects/2009/http-texture/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
   projects/2009/http-texture/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
   projects/2009/http-texture/indra/newview/skins/default/xui/es/floater_about.xml
   projects/2009/http-texture/indra/newview/skins/default/xui/es/floater_chat_history.xml
   projects/2009/http-texture/indra/newview/skins/default/xui/es/panel_preferences_audio.xml
   projects/2009/http-texture/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
   projects/2009/http-texture/indra/newview/skins/default/xui/es/panel_preferences_general.xml
   projects/2009/http-texture/indra/newview/skins/default/xui/ko/floater_about.xml
   projects/2009/http-texture/indra/newview/skins/default/xui/ko/floater_chat_history.xml
   projects/2009/http-texture/indra/newview/skins/default/xui/pl/floater_about.xml
   projects/2009/http-texture/indra/newview/skins/default/xui/pl/floater_buy_land.xml
   projects/2009/http-texture/indra/newview/skins/default/xui/pl/floater_chat_history.xml
   projects/2009/http-texture/indra/newview/skins/default/xui/pt/floater_about.xml
   projects/2009/http-texture/indra/newview/skins/default/xui/pt/floater_chat_history.xml
   projects/2009/http-texture/indra/newview/skins/default/xui/pt/panel_preferences_audio.xml
   projects/2009/http-texture/indra/newview/skins/default/xui/ru/floater_about.xml
   projects/2009/http-texture/indra/newview/skins/default/xui/ru/floater_chat_history.xml
   projects/2009/http-texture/indra/newview/skins/default/xui/uk/floater_chat_history.xml
   projects/2009/http-texture/indra/newview/skins/default/xui/zh/floater_about.xml
   projects/2009/http-texture/indra/newview/skins/default/xui/zh/floater_chat_history.xml
   projects/2009/http-texture/install.xml
Trac: http://svn.secondlife.com/trac/linden/changeset/2230
Log:
svn merge -r2162:2229 https://svn.secondlife.com/svn/linden/branches/2009/http-texture
Update to newest (1.23 RC0 + http-texture)


Property changes on: projects/2009/http-texture
___________________________________________________________________
Modified: last_good_build
   - 118368
   + 119381
Modified: svn:mergeinfo
   - /branches/2009/http-texture:2084-2162
   + /branches/2009/http-texture:2084-2229

Modified: projects/2009/http-texture/doc/asset_urls.txt
===================================================================
--- projects/2009/http-texture/doc/asset_urls.txt	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/doc/asset_urls.txt	2009-05-08 00:30:22 UTC (rev 2230)
@@ -1,5 +1,5 @@
-SLASSET_MD5=http://secondlife.com/developers/opensource/downloads/2009/04/oss-viewer/md5sums-oss-viewer-1.23.0.118368.txt
-SLASSET_ART=http://secondlife.com/developers/opensource/downloads/2009/04/oss-viewer/slviewer-artwork-oss-viewer-1.23.0.118368.zip
-SLASSET_LIBS_DARWIN=http://secondlife.com/developers/opensource/downloads/2009/04/oss-viewer/slviewer-darwin-libs-oss-viewer-1.23.0.118368.tar.gz
-SLASSET_LIBS_LINUXI386=http://secondlife.com/developers/opensource/downloads/2009/04/oss-viewer/slviewer-linux-libs-oss-viewer-1.23.0.118368.tar.gz
-SLASSET_LIBS_WIN32=http://secondlife.com/developers/opensource/downloads/2009/04/oss-viewer/slviewer-win32-libs-oss-viewer-1.23.0.118368.zip
+SLASSET_MD5=http://secondlife.com/developers/opensource/downloads/2009/05/oss-viewer/md5sums-oss-viewer-1.23.0.119381.txt
+SLASSET_ART=http://secondlife.com/developers/opensource/downloads/2009/05/oss-viewer/slviewer-artwork-oss-viewer-1.23.0.119381.zip
+SLASSET_LIBS_DARWIN=http://secondlife.com/developers/opensource/downloads/2009/05/oss-viewer/slviewer-darwin-libs-oss-viewer-1.23.0.119381.tar.gz
+SLASSET_LIBS_LINUXI386=http://secondlife.com/developers/opensource/downloads/2009/05/oss-viewer/slviewer-linux-libs-oss-viewer-1.23.0.119381.tar.gz
+SLASSET_LIBS_WIN32=http://secondlife.com/developers/opensource/downloads/2009/05/oss-viewer/slviewer-win32-libs-oss-viewer-1.23.0.119381.zip

Modified: projects/2009/http-texture/doc/contributions.txt
===================================================================
--- projects/2009/http-texture/doc/contributions.txt	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/doc/contributions.txt	2009-05-08 00:30:22 UTC (rev 2230)
@@ -439,6 +439,7 @@
 	VWR-2488
 	VWR-9557
 	VWR-12758
+	VWR-12686
 Ryozu Kojima
 	VWR-53
 	VWR-287

Modified: projects/2009/http-texture/indra/llcommon/llversionserver.h
===================================================================
--- projects/2009/http-texture/indra/llcommon/llversionserver.h	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/llcommon/llversionserver.h	2009-05-08 00:30:22 UTC (rev 2230)
@@ -36,7 +36,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 27;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 118368;
+const S32 LL_VERSION_BUILD = 119381;
 
 const char * const LL_CHANNEL = "Second Life Server";
 

Modified: projects/2009/http-texture/indra/llcommon/llversionviewer.h
===================================================================
--- projects/2009/http-texture/indra/llcommon/llversionviewer.h	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/llcommon/llversionviewer.h	2009-05-08 00:30:22 UTC (rev 2230)
@@ -36,7 +36,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 23;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 118368;
+const S32 LL_VERSION_BUILD = 119381;
 
 const char * const LL_CHANNEL = "Second Life Release";
 

Modified: projects/2009/http-texture/indra/llimage/CMakeLists.txt
===================================================================
--- projects/2009/http-texture/indra/llimage/CMakeLists.txt	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/llimage/CMakeLists.txt	2009-05-08 00:30:22 UTC (rev 2230)
@@ -3,6 +3,7 @@
 project(llimage)
 
 include(00-Common)
+include(LLAddBuildTest)
 include(LLCommon)
 include(LLImage)
 include(LLMath)
@@ -56,3 +57,6 @@
     ${PNG_LIBRARIES}
     ${ZLIB_LIBRARIES}
     )
+
+# Add tests
+ADD_BUILD_TEST(llimageworker llimage)

Modified: projects/2009/http-texture/indra/llimage/llimageworker.cpp
===================================================================
--- projects/2009/http-texture/indra/llimage/llimageworker.cpp	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/llimage/llimageworker.cpp	2009-05-08 00:30:22 UTC (rev 2230)
@@ -72,6 +72,15 @@
 	mCreationList.push_back(creation_info(image, priority, discard, needs_aux, responder));
 }
 
+// Used by unit test only
+// Returns the size of the mutex guarded list as an indication of sanity
+S32 LLImageDecodeThread::tut_size()
+{
+	LLMutexLock lock(mCreationMutex);
+	S32 res = mCreationList.size();
+	return res;
+}
+
 LLImageDecodeThread::Responder::~Responder()
 {
 }
@@ -106,7 +115,7 @@
 {
 	const F32 decode_time_slice = .1f;
 	bool done = true;
-	if (!mDecodedRaw)
+	if (!mDecodedRaw && mFormattedImage.notNull())
 	{
 		// Decode primary channels
 		if (mDecodedImageRaw.isNull())
@@ -131,7 +140,7 @@
 		done = mFormattedImage->decode(mDecodedImageRaw, decode_time_slice); // 1ms
 		mDecodedRaw = done;
 	}
-	if (done && mNeedsAux && !mDecodedAux)
+	if (done && mNeedsAux && !mDecodedAux && mFormattedImage.notNull())
 	{
 		// Decode aux channel
 		if (!mDecodedImageAux)
@@ -156,4 +165,9 @@
 	// Will automatically be deleted
 }
 
-
+// Used by unit test only
+// Checks that a responder exists for this instance so that something can happen when completion is reached
+bool LLImageDecodeThread::ImageRequest::tut_isOK()
+{
+	return mResponder.notNull();
+}

Modified: projects/2009/http-texture/indra/llimage/llimageworker.h
===================================================================
--- projects/2009/http-texture/indra/llimage/llimageworker.h	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/llimage/llimageworker.h	2009-05-08 00:30:22 UTC (rev 2230)
@@ -59,6 +59,9 @@
 
 		/*virtual*/ bool processRequest();
 		/*virtual*/ void finishRequest(bool completed);
+
+		// Used by unit tests to check the consitency of the request instance
+		bool tut_isOK();
 		
 	private:
 		// input
@@ -79,6 +82,9 @@
 					 U32 priority, S32 discard, BOOL needs_aux,
 					 Responder* responder);
 	S32 update(U32 max_time_ms);
+
+	// Used by unit tests to check the consistency of the thread instance
+	S32 tut_size();
 	
 private:
 	struct creation_info

Modified: projects/2009/http-texture/indra/newview/CMakeLists.txt
===================================================================
--- projects/2009/http-texture/indra/newview/CMakeLists.txt	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/CMakeLists.txt	2009-05-08 00:30:22 UTC (rev 2230)
@@ -334,6 +334,7 @@
     lltexturefetch.cpp
     lltextureinfo.cpp
     lltextureinfodetails.cpp
+    lltexturestats.cpp
     lltextureview.cpp
     lltoolbar.cpp
     lltoolbrush.cpp
@@ -744,6 +745,7 @@
     lltexturefetch.h
     lltextureinfo.h
     lltextureinfodetails.h
+    lltexturestats.h
     lltextureview.h
     lltool.h
     lltoolbar.h

Modified: projects/2009/http-texture/indra/newview/English.lproj/InfoPlist.strings
===================================================================
--- projects/2009/http-texture/indra/newview/English.lproj/InfoPlist.strings	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/English.lproj/InfoPlist.strings	2009-05-08 00:30:22 UTC (rev 2230)
@@ -1,7 +1,7 @@
-/* Localized versions of Info.plist keys */
-
-CFBundleName = "Second Life";
-
-CFBundleShortVersionString = "Second Life version 1.23.0.118368";
-CFBundleGetInfoString = "Second Life version 1.23.0.118368, Copyright 2004-2008 Linden Research, Inc.";
-
+/* Localized versions of Info.plist keys */
+
+CFBundleName = "Second Life";
+
+CFBundleShortVersionString = "Second Life version 1.23.0.119381";
+CFBundleGetInfoString = "Second Life version 1.23.0.119381, Copyright 2004-2008 Linden Research, Inc.";
+

Modified: projects/2009/http-texture/indra/newview/Info-SecondLife.plist
===================================================================
--- projects/2009/http-texture/indra/newview/Info-SecondLife.plist	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/Info-SecondLife.plist	2009-05-08 00:30:22 UTC (rev 2230)
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>Second Life</string>
-	<key>CFBundleIconFile</key>
-	<string>secondlife.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.secondlife.indra.viewer</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Second Life</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleURLName</key>
-			<string>Second Life URL</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>secondlife</string>
-			</array>
-			<key>LSIsAppleDefaultForScheme</key>
-			<true/>
-		</dict>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1.23.0.118368</string>
-	<key>CSResourcesFileMapped</key>
-	<true/>
-</dict>
-</plist>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>Second Life</string>
+	<key>CFBundleIconFile</key>
+	<string>secondlife.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.secondlife.indra.viewer</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>Second Life</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>Second Life URL</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>secondlife</string>
+			</array>
+			<key>LSIsAppleDefaultForScheme</key>
+			<true/>
+		</dict>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1.23.0.119381</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+</dict>
+</plist>

Modified: projects/2009/http-texture/indra/newview/installers/windows/installer_template.nsi
===================================================================
--- projects/2009/http-texture/indra/newview/installers/windows/installer_template.nsi	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/installers/windows/installer_template.nsi	2009-05-08 00:30:22 UTC (rev 2230)
@@ -228,13 +228,18 @@
 Function CheckNetworkConnection
     Push $0
     Push $1
+    Push $2	# Option value for GetOptions
     DetailPrint $(CheckNetworkConnectionDP)
+    ; Look for a tag value from the stub installer, used for statistics
+    ; to correlate installs.  Default to "" if not found on command line.
+    StrCpy $2 ""
+    ${GetOptions} $COMMANDLINE "/STUBTAG=" $2
     GetTempFileName $0
     !define HTTP_TIMEOUT 5000 ; milliseconds
     ; Don't show secondary progress bar, this will be quick.
     NSISdl::download_quiet \
         /TIMEOUT=${HTTP_TIMEOUT} \
-        "http://install.secondlife.com/check/?v=${VERSION_LONG}" \
+        "http://install.secondlife.com/check/?stubtag=$2&version=${VERSION_LONG}" \
         $0
     Pop $1 ; Return value, either "success", "cancel" or an error message
     ; MessageBox MB_OK "Download result: $1"
@@ -242,6 +247,7 @@
 	; StrCmp $1 "success" +2
 	;	DetailPrint "Connection failed: $1"
     Delete $0 ; temporary file
+    Pop $2
     Pop $1
     Pop $0
     Return

Modified: projects/2009/http-texture/indra/newview/llagent.cpp
===================================================================
--- projects/2009/http-texture/indra/newview/llagent.cpp	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/llagent.cpp	2009-05-08 00:30:22 UTC (rev 2230)
@@ -100,6 +100,7 @@
 #include "llstatusbar.h"
 #include "llstartup.h"
 #include "llimview.h"
+#include "lltexturestats.h"
 #include "lltool.h"
 #include "lltoolcomp.h"
 #include "lltoolfocus.h"
@@ -7789,3 +7790,4 @@
 }
 
 // EOF
+

Modified: projects/2009/http-texture/indra/newview/llappviewer.cpp
===================================================================
--- projects/2009/http-texture/indra/newview/llappviewer.cpp	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/llappviewer.cpp	2009-05-08 00:30:22 UTC (rev 2230)
@@ -57,6 +57,7 @@
 #include "llares.h" 
 #include "llcurl.h"
 #include "llfloatersnapshot.h"
+#include "lltexturestats.h"
 #include "llviewerwindow.h"
 #include "llviewerdisplay.h"
 #include "llviewermedia.h"

Modified: projects/2009/http-texture/indra/newview/llfloatersnapshot.cpp
===================================================================
--- projects/2009/http-texture/indra/newview/llfloatersnapshot.cpp	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/llfloatersnapshot.cpp	2009-05-08 00:30:22 UTC (rev 2230)
@@ -508,7 +508,8 @@
 				gGL.end();
 			}
 
-			if (mShineAnimTimer.getElapsedTimeF32() > SHINE_TIME)
+			// if we're at the end of the animation, stop
+			if (shine_interp >= 1.f)
 			{
 				mShineAnimTimer.stop();
 			}

Modified: projects/2009/http-texture/indra/newview/llpanelclassified.cpp
===================================================================
--- projects/2009/http-texture/indra/newview/llpanelclassified.cpp	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/llpanelclassified.cpp	2009-05-08 00:30:22 UTC (rev 2230)
@@ -74,7 +74,7 @@
 const S32 MINIMUM_PRICE_FOR_LISTING = 50;	// L$
 const S32 MATURE_UNDEFINED = -1;
 const S32 MATURE_CONTENT = 1;
-const S32 NON_MATURE_CONTENT = 2;
+const S32 PG_CONTENT = 2;
 const S32 DECLINE_TO_STATE = 0;
 
 //static
@@ -291,7 +291,7 @@
 	{
 		// Teens don't get to set mature flag. JC
 		mMatureCombo->setVisible(FALSE);
-		mMatureCombo->setCurrentByIndex(NON_MATURE_CONTENT);
+		mMatureCombo->setCurrentByIndex(PG_CONTENT);
 	}
 
 	if (!mInFinder)
@@ -409,6 +409,9 @@
 	}
 
 	mUpdateBtn->setLabel(getString("publish_txt"));
+	
+	// simulate clicking the "location" button
+	LLPanelClassified::onClickSet(this);
 }
 
 
@@ -664,7 +667,7 @@
 		}
 		else
 		{
-			self->mMatureCombo->setCurrentByIndex(NON_MATURE_CONTENT);
+			self->mMatureCombo->setCurrentByIndex(PG_CONTENT);
 		}
 		if (self->mAutoRenewCheck)
 		{
@@ -828,7 +831,7 @@
 		mMatureCombo->setCurrentByIndex(MATURE_CONTENT);
 		break;
 	case 1:
-		mMatureCombo->setCurrentByIndex(NON_MATURE_CONTENT);
+		mMatureCombo->setCurrentByIndex(PG_CONTENT);
 		break;
 	default:
 		return false;
@@ -985,7 +988,13 @@
 	self->mPosGlobal = gAgent.getPositionGlobal();
 
 	std::string location_text;
-	location_text.assign("(will update after publish)");
+	std::string regionName = "(will update after publish)";
+	LLViewerRegion* pRegion = gAgent.getRegion();
+	if (pRegion)
+	{
+		regionName = pRegion->getName();
+	}
+	location_text.assign(regionName);
 	location_text.append(", ");
 
     S32 region_x = llround((F32)self->mPosGlobal.mdV[VX]) % REGION_WIDTH_UNITS;
@@ -1142,7 +1151,7 @@
 	switch( regionp->getSimAccess() )
 	{
 		case SIM_ACCESS_PG:	
-			force_access = NON_MATURE_CONTENT;
+			force_access = PG_CONTENT;
 			break;
 		case SIM_ACCESS_ADULT:
 			force_access = MATURE_CONTENT;

Copied: projects/2009/http-texture/indra/newview/lltexturestats.cpp (from rev 2229, branches/2009/http-texture/indra/newview/lltexturestats.cpp)
===================================================================
--- projects/2009/http-texture/indra/newview/lltexturestats.cpp	                        (rev 0)
+++ projects/2009/http-texture/indra/newview/lltexturestats.cpp	2009-05-08 00:30:22 UTC (rev 2230)
@@ -0,0 +1,89 @@
+/** 
+ * @file lltexturerstats.cpp
+ * @brief texture stats helper methods
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "pipeline.h" 
+#include "llagent.h"
+#include "lltexturefetch.h" 
+#include "lltexturestats.h"
+#include "llviewerregion.h"
+
+
+static LLSD averagesList;
+void reset_texture_stats()
+{
+	llinfos << "Resetting texture download stats data" << llendl;
+	averagesList.clear();
+}
+
+void capture_texture_stats_snapshot(U64 currentTime)
+{
+	static U32 monotonic_counter = 0;
+	llinfos << "Taking texture snapshot" << llendl;
+	if ( LLAppViewer::getTextureFetch() && LLAppViewer::getTextureFetch()->getTextureInfo())
+	{
+		std::stringstream time_string;
+		time_string << currentTime;
+
+		LLSD snapshot;
+		snapshot["time"] = time_string.str();
+		snapshot["texture_data"] = LLAppViewer::getTextureFetch()->getTextureInfo()->getAverages();
+
+		std::stringstream message_number;
+		message_number << "snapshot_" << ++monotonic_counter;
+		averagesList[message_number.str()] = snapshot;
+		llinfos << "Recorded snapshot " << monotonic_counter << llendl;
+	}
+}
+
+void send_texture_stats_to_sim()
+{
+	LLSD texture_stats;
+	// Only send stats if the agent is connected to a region.
+	if (!gAgent.getRegion() || gNoRender)
+	{
+		return;
+	}
+
+	LLUUID agent_id = gAgent.getID();
+	texture_stats["agent_id"] = agent_id;
+	texture_stats["texture_details"] = averagesList;
+
+	std::string texture_cap_url = gAgent.getRegion()->getCapability("TextureStats");
+	if ( texture_cap_url != "" )
+	{
+		llinfos << "Sending texture stats to simulator" << llendl;
+		LLHTTPClient::post(texture_cap_url, texture_stats, NULL);
+	}
+}
+

Copied: projects/2009/http-texture/indra/newview/lltexturestats.h (from rev 2229, branches/2009/http-texture/indra/newview/lltexturestats.h)
===================================================================
--- projects/2009/http-texture/indra/newview/lltexturestats.h	                        (rev 0)
+++ projects/2009/http-texture/indra/newview/lltexturestats.h	2009-05-08 00:30:22 UTC (rev 2230)
@@ -0,0 +1,43 @@
+/** 
+ * @file lltexturestats.h
+ * @brief texture stats utilities
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLTEXTURESTATS_H
+#define LL_LLTEXTURESTATS_H
+
+#include "llappviewer.h"
+
+// utility functions to capture data on texture download speeds and send to simulator periodically
+void capture_texture_stats_snapshot(U64 currentTime);
+void send_texture_stats_to_sim();
+void reset_texture_stats();
+
+#endif // LL_LLTEXTURESTATS_H

Modified: projects/2009/http-texture/indra/newview/llviewermessage.cpp
===================================================================
--- projects/2009/http-texture/indra/newview/llviewermessage.cpp	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/llviewermessage.cpp	2009-05-08 00:30:22 UTC (rev 2230)
@@ -105,6 +105,7 @@
 #include "llstatenums.h"
 #include "llstatusbar.h"
 #include "llimview.h"
+#include "lltexturestats.h"
 #include "lltool.h"
 #include "lltoolbar.h"
 #include "lltoolmgr.h"
@@ -5644,3 +5645,4 @@
 	params.functor(boost::bind(&LLOfferInfo::inventory_offer_callback, this, _1, _2));
 	LLNotifications::instance().forceResponse(params, response);
 }
+

Modified: projects/2009/http-texture/indra/newview/llviewerstats.cpp
===================================================================
--- projects/2009/http-texture/indra/newview/llviewerstats.cpp	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/llviewerstats.cpp	2009-05-08 00:30:22 UTC (rev 2230)
@@ -792,44 +792,3 @@
 	LLHTTPClient::post(url, body, new ViewerStatsResponder());
 }
 
-static LLSD averagesList;
-void reset_texture_stats()
-{
-	llinfos << "Resetting texture download stats data" << llendl;
-	averagesList.clear();
-}
-
-void capture_texture_stats_snapshot(U64 currentTime)
-{
-	if ( LLAppViewer::getTextureFetch() && LLAppViewer::getTextureFetch()->getTextureInfo())
-	{
-		LLSD averages = LLAppViewer::getTextureFetch()->getTextureInfo()->getAverages();
-		std::ostringstream time;
-		time << currentTime;
-		averagesList[time.str()] = averages;
-		llinfos << "Taking texture snapshot" << llendl;
-	}
-	llinfos << "Not taking texture snapshot - not enough infrastructure in place yet" << llendl;
-}
-
-void send_texture_stats_to_sim()
-{
-	// send the snapshots to the simulator
-	LLSD texture_stats;
-	LLSD texture_download_speeds;
-	LLSD network_data;
-
-	// Only send stats if the agent is connected to a region.
-	if (!gAgent.getRegion() || gNoRender)
-	{
-		return;
-	}
-
-	std::string texture_cap_url = gAgent.getRegion()->getCapability("TextureStats");
-	if ( texture_cap_url != "" )
-	{
-		llinfos << "Sending texture stats to simulator" << llendl;
-		LLHTTPClient::post(texture_cap_url, averagesList, NULL);
-	}
-}
-

Modified: projects/2009/http-texture/indra/newview/llviewerstats.h
===================================================================
--- projects/2009/http-texture/indra/newview/llviewerstats.h	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/llviewerstats.h	2009-05-08 00:30:22 UTC (rev 2230)
@@ -206,11 +206,6 @@
 void update_statistics(U32 frame_count);
 void send_stats();
 
-// utility functions to capture data on texture download speeds and send to simulator periodically
-void capture_texture_stats_snapshot(U64 currentTime);
-void send_texture_stats_to_sim();
-void reset_texture_stats();
-
 extern std::map<S32,LLFrameTimer> gDebugTimers;
 extern std::map<S32,std::string> gDebugTimerLabel;
 

Modified: projects/2009/http-texture/indra/newview/res/viewerRes.rc
===================================================================
--- projects/2009/http-texture/indra/newview/res/viewerRes.rc	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/res/viewerRes.rc	2009-05-08 00:30:22 UTC (rev 2230)
@@ -1,193 +1,193 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#ifdef IDC_STATIC
-#undef IDC_STATIC
-#endif
-#define IDC_STATIC (-1)
-#include "winresrc.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-// Commented out because it only compiles if you have MFC installed.
-//#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_LL_ICON             ICON                    "ll_icon.ico"
-IDI_LCD_LL_ICON         ICON                    "icon1.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-SPLASHSCREEN DIALOG  32, 32, 144, 34
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
-FONT 8, "MS Sans Serif"
-BEGIN
-    ICON            IDI_LL_ICON,IDC_STATIC,7,7,20,20
-    LTEXT           "Loading Second Life...",666,36,13,91,8
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
-BEGIN
-
-    "SPLASHSCREEN", DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 137
-        VERTGUIDE, 36
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 27
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Cursor
-//
-
-TOOLGRAB                CURSOR                  "lltoolgrab.cur"
-TOOLLAND                CURSOR                  "lltoolland.cur"
-TOOLZOOMIN              CURSOR                  "lltoolzoomin.cur"
-TOOLCREATE              CURSOR                  "lltoolcreate.cur"
-ARROWDRAG               CURSOR                  "llarrowdrag.cur"
-ARROW                   CURSOR                  "llarrow.cur"
-NOLOCKED                CURSOR                  "llnolocked.cur"
-ARROWLOCKED             CURSOR                  "llarrowlocked.cur"
-GRABLOCKED              CURSOR                  "llgrablocked.cur"
-TOOLROTATE              CURSOR                  "lltoolrotate.cur"
-TOOLTRANSLATE           CURSOR                  "lltooltranslate.cur"
-TOOLSCALE               CURSOR                  "lltoolscale.cur"
-TOOLCAMERA              CURSOR                  "lltoolcamera.cur"
-TOOLPAN                 CURSOR                  "lltoolpan.cur"
-TOOLFOCUS               CURSOR                  "lltoolfocus.cur"
-TOOLPICKOBJECT3         CURSOR                  "toolpickobject3.cur"
-ARROWCOPY               CURSOR                  "arrowcop.cur"
-ARROWDRAGMULTI          CURSOR                  "llarrowdragmulti.cur"
-ARROWCOPYMULTI          CURSOR                  "arrowcopmulti.cur"
-TOOLSIT                 CURSOR                  "toolsit.cur"
-TOOLBUY                 CURSOR                  "toolbuy.cur"
-TOOLPAY                 CURSOR                  "toolpay.cur"
-TOOLOPEN                CURSOR                  "toolopen.cur"
-TOOLPIPETTE             CURSOR                  "toolpipette.cur"
-TOOLPLAY                CURSOR                  "toolplay.cur"
-TOOLPAUSE               CURSOR                  "toolpause.cur"
-TOOLMEDIAOPEN           CURSOR                  "toolmediaopen.cur"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,23,0,118368
- PRODUCTVERSION 1,23,0,118368
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "Linden Lab"
-            VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.23.0.118368"
-            VALUE "InternalName", "Second Life"
-            VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
-            VALUE "OriginalFilename", "SecondLife.exe"
-            VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "1.23.0.118368"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#ifdef IDC_STATIC
+#undef IDC_STATIC
+#endif
+#define IDC_STATIC (-1)
+#include "winresrc.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+// Commented out because it only compiles if you have MFC installed.
+//#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_LL_ICON             ICON                    "ll_icon.ico"
+IDI_LCD_LL_ICON         ICON                    "icon1.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+SPLASHSCREEN DIALOG  32, 32, 144, 34
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
+FONT 8, "MS Sans Serif"
+BEGIN
+    ICON            IDI_LL_ICON,IDC_STATIC,7,7,20,20
+    LTEXT           "Loading Second Life...",666,36,13,91,8
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+
+    "SPLASHSCREEN", DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 137
+        VERTGUIDE, 36
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 27
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Cursor
+//
+
+TOOLGRAB                CURSOR                  "lltoolgrab.cur"
+TOOLLAND                CURSOR                  "lltoolland.cur"
+TOOLZOOMIN              CURSOR                  "lltoolzoomin.cur"
+TOOLCREATE              CURSOR                  "lltoolcreate.cur"
+ARROWDRAG               CURSOR                  "llarrowdrag.cur"
+ARROW                   CURSOR                  "llarrow.cur"
+NOLOCKED                CURSOR                  "llnolocked.cur"
+ARROWLOCKED             CURSOR                  "llarrowlocked.cur"
+GRABLOCKED              CURSOR                  "llgrablocked.cur"
+TOOLROTATE              CURSOR                  "lltoolrotate.cur"
+TOOLTRANSLATE           CURSOR                  "lltooltranslate.cur"
+TOOLSCALE               CURSOR                  "lltoolscale.cur"
+TOOLCAMERA              CURSOR                  "lltoolcamera.cur"
+TOOLPAN                 CURSOR                  "lltoolpan.cur"
+TOOLFOCUS               CURSOR                  "lltoolfocus.cur"
+TOOLPICKOBJECT3         CURSOR                  "toolpickobject3.cur"
+ARROWCOPY               CURSOR                  "arrowcop.cur"
+ARROWDRAGMULTI          CURSOR                  "llarrowdragmulti.cur"
+ARROWCOPYMULTI          CURSOR                  "arrowcopmulti.cur"
+TOOLSIT                 CURSOR                  "toolsit.cur"
+TOOLBUY                 CURSOR                  "toolbuy.cur"
+TOOLPAY                 CURSOR                  "toolpay.cur"
+TOOLOPEN                CURSOR                  "toolopen.cur"
+TOOLPIPETTE             CURSOR                  "toolpipette.cur"
+TOOLPLAY                CURSOR                  "toolplay.cur"
+TOOLPAUSE               CURSOR                  "toolpause.cur"
+TOOLMEDIAOPEN           CURSOR                  "toolmediaopen.cur"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,23,0,119381
+ PRODUCTVERSION 1,23,0,119381
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "Linden Lab"
+            VALUE "FileDescription", "Second Life"
+            VALUE "FileVersion", "1.23.0.119381"
+            VALUE "InternalName", "Second Life"
+            VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
+            VALUE "OriginalFilename", "SecondLife.exe"
+            VALUE "ProductName", "Second Life"
+            VALUE "ProductVersion", "1.23.0.119381"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

Modified: projects/2009/http-texture/indra/newview/skins/default/xui/en-us/floater_preview_existing_landmark.xml
===================================================================
--- projects/2009/http-texture/indra/newview/skins/default/xui/en-us/floater_preview_existing_landmark.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/skins/default/xui/en-us/floater_preview_existing_landmark.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-520" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="515" left="242" min_height="515"
+<floater bottom="-311" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" enabled="true" height="495" left="242" min_height="510"
      min_width="460" mouse_opaque="true" name="existing_landmark_preview"
-     width="460">
-	<panel follows="top|left" height="475" top="-10" left="10"
+     width="440">
+	<panel bottom="0" follows="bottom|left" height="475" left="0"
 	     name="place_details_panel" width="440" />
 </floater>

Modified: projects/2009/http-texture/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml
===================================================================
--- projects/2009/http-texture/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -30,8 +30,8 @@
     <combo_item name="mature" value="Mature">
       Mature Content
     </combo_item>
-    <combo_item name="not_mature" value="Not Mature">
-      Not Mature Content
+    <combo_item name="pg" value="PG">
+      PG Content
     </combo_item>
   </combo_box>
 	<text bottom_delta="-25" follows="left|top"

Modified: projects/2009/http-texture/indra/newview/skins/default/xui/en-us/panel_classified.xml
===================================================================
--- projects/2009/http-texture/indra/newview/skins/default/xui/en-us/panel_classified.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/skins/default/xui/en-us/panel_classified.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -30,8 +30,8 @@
     <combo_item name="mature" value="Mature">
       Mature Content
     </combo_item>
-    <combo_item name="not_mature" value="Not Mature">
-      Not Mature Content
+    <combo_item name="pg" value="PG">
+      PG Content
     </combo_item>
   </combo_box>
 	<combo_box bg_readonly_color="grey" bottom="445" follows="left|top" height="18" label=""

Modified: projects/2009/http-texture/indra/newview/skins/default/xui/en-us/panel_group_general.xml
===================================================================
--- projects/2009/http-texture/indra/newview/skins/default/xui/en-us/panel_group_general.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/skins/default/xui/en-us/panel_group_general.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -111,8 +111,8 @@
 			<combo_item name="mature" value="Mature">
 			Mature Content
 			</combo_item>
-			<combo_item name="not_mature" value="Not Mature">
-			Not Mature Content
+			<combo_item name="pg" value="PG">
+			PG Content
 			</combo_item>
 		</combo_box>
 

Modified: projects/2009/http-texture/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
===================================================================
--- projects/2009/http-texture/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -91,7 +91,7 @@
 		 I want to access content rated:
 	</text>
 	<combo_box bottom="-328" follows="left|top" height="18" left="315"
-	     mouse_opaque="true" name="maturity_desired_combobox" width="130">
+	     mouse_opaque="true" name="maturity_desired_combobox" width="150">
 		<combo_item name="Desired_Adult" value="42">
 			PG, Mature and Adult
 		</combo_item>
@@ -105,7 +105,7 @@
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom="-322" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="315"
-	     mouse_opaque="true" name="maturity_desired_textbox" v_pad="0" width="130">
+	     mouse_opaque="true" name="maturity_desired_textbox" v_pad="0" width="150">
 		 PG only
 	</text>
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

Modified: projects/2009/http-texture/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
===================================================================
--- projects/2009/http-texture/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -33,7 +33,7 @@
 	     embedded_items="false" enabled="false" follows="left|top"
 	     font="SansSerifSmall" height="65" hide_border="true" hide_scrollbar="true"
 	     left_delta="20" max_length="65535" mouse_opaque="true"
-	     name="voice_chat_description" tab_stop="false" width="450" word_wrap="true">
+	     name="voice_chat_description" tab_stop="false" width="465" word_wrap="true">
 		Push-to-Talk mode lets you control when your voice is transmitted. When in toggle mode, press and release the push-to-talk trigger to switch your microphone on and off. When not in toggle mode, the microphone is active only when the trigger is held down.
 	</text_editor>
 	<check_box bottom_delta="-20" enabled="true"

Modified: projects/2009/http-texture/indra/newview/skins/default/xui/es/floater_about.xml
===================================================================
--- projects/2009/http-texture/indra/newview/skins/default/xui/es/floater_about.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/skins/default/xui/es/floater_about.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -21,7 +21,8 @@
   SSLeay Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
   xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
   zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-
+  google-perftools Copyright (c) 2005, Google Inc.
+  
   All rights reserved.  See licenses.txt for details.
 
   Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)

Modified: projects/2009/http-texture/indra/newview/skins/default/xui/es/floater_chat_history.xml
===================================================================
--- projects/2009/http-texture/indra/newview/skins/default/xui/es/floater_chat_history.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/skins/default/xui/es/floater_chat_history.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -21,6 +21,45 @@
 	<string name="IM_end_log_string">
 		-- Fin del registro --
 	</string>
+  <string name="ScriptQuestionCautionChatGranted">
+	&apos;[OBJECTNAME]&apos;, un objeto propiedad de &apos;[OWNERNAME]&apos;, localizado en [REGIONNAME] con la posición [REGIONPOS], ha recibido permiso para: [PERMISSIONS].
+  </string>
+  <string name="ScriptQuestionCautionChatDenied">
+	A &apos;[OBJECTNAME]&apos;, un objeto propiedad de &apos;[OWNERNAME]&apos;, localizado en [REGIONNAME] con la posición [REGIONPOS], se le ha denegado el permiso para: [PERMISSIONS].
+  </string>
+  <string name="ScriptTakeMoney">
+	Cogerle a usted dólares Linden (L$)
+  </string>
+  <string name="ActOnControlInputs">
+	Actuar en sus controles de entrada
+  </string>
+  <string name="RemapControlInputs">
+	Reconfigurar sus controles de entrada
+  </string>
+  <string name="AnimateYourAvatar">
+	Ejecutar animaciones en su avatar
+  </string>
+  <string name="AttachToYourAvatar">
+	Anexarse a su avatar
+  </string>
+  <string name="ReleaseOwnership">
+	Anular la propiedad y que pase a ser público
+  </string>
+  <string name="LinkAndDelink">
+	Enlazar y desenlazar de otros objetos
+  </string>
+  <string name="AddAndRemoveJoints">
+	Añadir y quitar uniones con otros objetos
+  </string>
+  <string name="ChangePermissions">
+	Cambiar sus permisos
+  </string>
+  <string name="TrackYourCamera">
+	Seguir su cámara
+  </string>
+  <string name="ControlYourCamera">
+	Controlar su cámara
+  </string>
 	<layout_stack name="panels">
 		<layout_panel name="im_contents_panel">
 			<combo_box label="Gestos" name="Gesture">

Modified: projects/2009/http-texture/indra/newview/skins/default/xui/es/panel_preferences_audio.xml
===================================================================
--- projects/2009/http-texture/indra/newview/skins/default/xui/es/panel_preferences_audio.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/skins/default/xui/es/panel_preferences_audio.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -3,20 +3,22 @@
 	<text length="1" name="muting_text" type="string">
 		Volumen:
 	</text>
-	<text name="streaming_prefs_text">
+	<text name="streaming_prefs_text" bottom="-195" >
 		Preferencias multimedia:
 	</text>
 	<text name="audio_prefs_text">
 		Preferencias de sonido:
 	</text>
 	<panel label="Volumen" name="Volume Panel"/>
-	<check_box label="Si hay música, reproducirla en streaming (usa más ancho de banda)" name="streaming_music"/>
-	<check_box label="Si hay media, reproducirlos en streaming (usa más ancho de banda)" name="streaming_video"/>
-	<check_box label="Reproducir automáticamente los media" name="auto_streaming_video"/>
+	<check_box bottom="-200" height="32" label="Si hay música, reproducirla en streaming &#10;
+(usa más ancho de banda)" name="streaming_music"/>
+	<check_box bottom_delta="-32" height="32" label="Si hay media, reproducirlos en streaming &#10;
+(usa más ancho de banda)" name="streaming_video"/>
+	<check_box bottom_delta="-32" label="Reproducir automáticamente los media" name="auto_streaming_video"/>
 	<check_box label="Silenciar el sonido al minimizar la ventana" name="mute_when_minimized"/>
-	<slider label="Efecto Doppler" name="Doppler Effect"/>
-	<slider label="Distancia de escucha" name="Distance Factor"/>
-	<slider label="Nivel de atenuación" name="Rolloff Factor"/>
-	<spinner label="Avisar de transacción de L$ desde" name="L$ Change Threshold"/>
-	<spinner label="Avisar del estado de la vida desde" name="Health Change Threshold"/>
+	<slider label="Efecto Doppler" name="Doppler Effect" label_width="140" width="270" />
+	<slider label="Distancia de escucha" name="Distance Factor" label_width="140" width="270" />
+	<slider label="Nivel de atenuación" name="Rolloff Factor" label_width="140" width="270" />
+	<spinner label="Avisar de transacción de L$ desde" name="L$ Change Threshold" label_width="195" width="259"/>
+	<spinner label="Avisar del estado de la vida desde" name="Health Change Threshold" label_width="195" width="259"/>
 </panel>

Modified: projects/2009/http-texture/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
===================================================================
--- projects/2009/http-texture/indra/newview/skins/default/xui/es/panel_preferences_chat.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/skins/default/xui/es/panel_preferences_chat.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -18,14 +18,14 @@
 		Color del chat:
 	</text>
 	<color_swatch label="Usted" name="user"/>
-	<color_swatch label="Otros" name="agent"/>
-	<color_swatch label="MI" name="im"/>
+	<color_swatch label="Otros" name="agent" width="60" left_delta="48"/>
+	<color_swatch label="MI" name="im" left_delta="64" width="50"/>
 	<color_swatch label="Sistema" name="system"/>
-	<color_swatch label="Errores" name="script_error"/>
+	<color_swatch label="Errores" name="script_error" left_delta="48"/>
 	<color_swatch label="Objetos" name="objects"/>
-	<color_swatch label="Propietario" name="owner"/>
-	<color_swatch label="Bocadillo" name="background"/>
-	<color_swatch label="URL" name="links"/>
+	<color_swatch label="Propietario" name="owner" width="60" left_delta="48"/>
+	<color_swatch label="Bocadillo" name="background" left_delta="64"  width="50"/>
+	<color_swatch label="URL" name="links" />
 	<text length="1" name="text_box8" type="string">
 		Errores de script:
 	</text>
@@ -33,9 +33,9 @@
 	<text length="1" name="text_box3" type="string">
 		Consola del chat:
 	</text>
-	<spinner label="Quitar el chat tras" name="fade_chat_time"/>
-	<text length="1" name="text_box4" type="string">
-		(segundos)
+	<spinner label="Quitar el chat tras" name="fade_chat_time" label_width="95" width="145" />
+	<text length="1" name="text_box4" type="string" left="297" >
+		(s)
 	</text>
 	<text length="1" name="text_box5" type="string">
 		(# líneas)

Modified: projects/2009/http-texture/indra/newview/skins/default/xui/es/panel_preferences_general.xml
===================================================================
--- projects/2009/http-texture/indra/newview/skins/default/xui/es/panel_preferences_general.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/skins/default/xui/es/panel_preferences_general.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -9,7 +9,7 @@
 		</radio_item>
 	</radio_group>
 	<check_box label="Ver mi posición inicial en la pantalla de inicio de sesión" name="show_location_checkbox"/>
-	<combo_box name="fade_out_combobox">
+	<combo_box name="fade_out_combobox" width="166">
 		<combo_item name="Never">
 			Nunca
 		</combo_item>
@@ -55,13 +55,13 @@
 	<text length="1" name="language_textbox" type="string">
 		Idioma:
 	</text>
-	<text length="1" name="language_textbox2" type="string">
+	<text length="1" name="language_textbox2" type="string" left_delta="313" >
 		(Tendrá efecto tras reiniciar)
 	</text>
 	<string name="region_name_prompt">
 		&lt;escriba el nombre de la región&gt;
 	</string>
-	<combo_box name="crash_behavior_combobox">
+	<combo_box name="crash_behavior_combobox" width="166">
 		<combo_item length="1" name="Askbeforesending" type="string">
 			Preguntar antes de enviar
 		</combo_item>
@@ -72,7 +72,7 @@
 			No enviar nunca
 		</combo_item>
 	</combo_box>
-	<combo_box name="language_combobox">
+	<combo_box name="language_combobox" width="166">
 		<combo_item name="System Default Language">
 			Predeterminado del sistema
 		</combo_item>

Modified: projects/2009/http-texture/indra/newview/skins/default/xui/ko/floater_about.xml
===================================================================
--- projects/2009/http-texture/indra/newview/skins/default/xui/ko/floater_about.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/skins/default/xui/ko/floater_about.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -20,7 +20,8 @@
   SSLeay Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
   xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
   zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-
+  google-perftools Copyright (c) 2005, Google Inc.
+  
   저작권 보유.  자세한 내용은 licenses.txt를 참조하십시오.
 
   음성 채팅 오디오 코딩: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)

Modified: projects/2009/http-texture/indra/newview/skins/default/xui/ko/floater_chat_history.xml
===================================================================
--- projects/2009/http-texture/indra/newview/skins/default/xui/ko/floater_chat_history.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/skins/default/xui/ko/floater_chat_history.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -21,6 +21,45 @@
 	<string name="IM_end_log_string">
 		-- 로그 끝 --
 	</string>
+  <string name="ScriptQuestionCautionChatGranted">
+	[REGIONPOS]의[REGIONNAME] 에 위치하며 &apos;[OBJECTNAME]&apos;, &apos;[OWNERNAME]&apos;가 소유하는 오브젝트는 다음과 같은 권한이 있음: [PERMISSIONS].
+  </string>
+  <string name="ScriptQuestionCautionChatDenied">
+	[REGIONPOS]의[REGIONNAME] 에 위치하며 &apos;[OBJECTNAME]&apos;, &apos;[OWNERNAME]&apos;가 소유하는 오브젝트는 다음과 같은 권한이 거부되었음: [PERMISSIONS].
+  </string>
+  <string name="ScriptTakeMoney">
+	사용자로부터 린든 달러(L$) 가져오기
+  </string>
+  <string name="ActOnControlInputs">
+	제어 입력 사항에 따라 행동
+  </string>
+  <string name="RemapControlInputs">
+	제어 입력 사항 다시 매핑
+  </string>
+  <string name="AnimateYourAvatar">
+	아바타에 애니메이션 효과 주기
+  </string>
+  <string name="AttachToYourAvatar">
+	자신의 아바타에 착용
+  </string>
+  <string name="ReleaseOwnership">
+	소유권 해제 및 공개
+  </string>
+  <string name="LinkAndDelink">
+	다른 오브젝트와의 연결 및 연결 해제
+  </string>
+  <string name="AddAndRemoveJoints">
+	다른 오브젝트와 함께 추가 및 삭제
+  </string>
+  <string name="ChangePermissions">
+	권한 변경
+  </string>
+  <string name="TrackYourCamera">
+	카메라 추적
+  </string>
+  <string name="ControlYourCamera">
+	카메라 제어
+  </string>
 	<layout_stack name="panels">
 		<layout_panel name="im_contents_panel">
 			<combo_box label="제스처" name="Gesture">

Modified: projects/2009/http-texture/indra/newview/skins/default/xui/pl/floater_about.xml
===================================================================
--- projects/2009/http-texture/indra/newview/skins/default/xui/pl/floater_about.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/skins/default/xui/pl/floater_about.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -20,11 +20,11 @@
   SSLeay Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
   xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
   zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-
+  google-perftools Copyright (c) 2005, Google Inc.
+  
   Wszystkie prawa zastrzeżone.  Szczegóły w pliku licenses.txt.
 
-  Programowanie dźwięku czatu: Polycom(R) Siren14(TM) 
-  (ITU-T Rec. G.722.1 Annex C)
+  Programowanie dźwięku czatu: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
   
   Polska wersja klienta: Maciek Marksman, Malwina Dollinger, Magnus Balczo
   IMy z sugestiami, komentarzami i poprawkami mile widziane

Modified: projects/2009/http-texture/indra/newview/skins/default/xui/pl/floater_buy_land.xml
===================================================================
--- projects/2009/http-texture/indra/newview/skins/default/xui/pl/floater_buy_land.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/skins/default/xui/pl/floater_buy_land.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -52,7 +52,7 @@
 	<text name="info_price" left_delta="62">
 		1500 L$, obiekty wliczone
 	</text>
-	<text name="info_action" width="350">
+	<text name="info_action">
 		Zakup tej Posiadłości spowoduje:
 	</text>
 	<text name="error_message">

Modified: projects/2009/http-texture/indra/newview/skins/default/xui/pl/floater_chat_history.xml
===================================================================
--- projects/2009/http-texture/indra/newview/skins/default/xui/pl/floater_chat_history.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/skins/default/xui/pl/floater_chat_history.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -21,6 +21,45 @@
 	<string name="IM_end_log_string">
 		-- Koniec zapisu --
 	</string>
+  <string name="ScriptQuestionCautionChatGranted">
+	&apos;[OBJECTNAME]&apos;, właściciel: &apos;[OWNERNAME]&apos;, położenie: [REGIONNAME] [REGIONPOS], pozwala Ci na: [PERMISSIONS].
+  </string>
+  <string name="ScriptQuestionCautionChatDenied">
+	&apos;[OBJECTNAME]&apos;, właściciel: &apos;[OWNERNAME]&apos;, położenie: [REGIONNAME] [REGIONPOS], nie pozwala Ci na: [PERMISSIONS].
+  </string>
+  <string name="ScriptTakeMoney">
+	Zabiera Lindeny (L$) od Ciebie
+  </string>
+  <string name="ActOnControlInputs">
+	Używaj klawiszy sterowania
+  </string>
+  <string name="RemapControlInputs">
+	Zmień klawisze sterowania
+  </string>
+  <string name="AnimateYourAvatar">
+	Animuj Awatara
+  </string>
+  <string name="AttachToYourAvatar">
+	Dołącz do Awatara
+  </string>
+  <string name="ReleaseOwnership">
+	Usuń prawo własności (zmień na publiczne)
+  </string>
+  <string name="LinkAndDelink">
+	Łącz / odłącz z innymi obiektów
+  </string>
+  <string name="AddAndRemoveJoints">
+	Dodaj / usuń połączenia z innymi obiektami
+  </string>
+  <string name="ChangePermissions">
+	Ustaw zezwolenia
+  </string>
+  <string name="TrackYourCamera">
+	Chodź za kamerą
+  </string>
+  <string name="ControlYourCamera">
+	Kontroluj kamerÄ™
+  </string>
 	<layout_stack name="panels">
 		<layout_panel name="im_contents_panel">
 			<combo_box label="Gesty" name="Gesture">

Modified: projects/2009/http-texture/indra/newview/skins/default/xui/pt/floater_about.xml
===================================================================
--- projects/2009/http-texture/indra/newview/skins/default/xui/pt/floater_about.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/skins/default/xui/pt/floater_about.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -21,9 +21,10 @@
   SSLeay Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
   xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
   zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
+  google-perftools Copyright (c) 2005, Google Inc.
+  
+  Todos os direitos reservados.  Veja licenças.txt para detalhes.
 
- Todos os direitos reservados.  Veja licenças.txt para detalhes.
-
   Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
 
 

Modified: projects/2009/http-texture/indra/newview/skins/default/xui/pt/floater_chat_history.xml
===================================================================
--- projects/2009/http-texture/indra/newview/skins/default/xui/pt/floater_chat_history.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/skins/default/xui/pt/floater_chat_history.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -21,6 +21,45 @@
 	<string name="IM_end_log_string">
 		-- Fim do Log --
 	</string>
+  <string name="ScriptQuestionCautionChatGranted">
+	&apos;[OBJECTNAME]&apos;, um objeto de  &apos;[OWNERNAME]&apos;, localizado em [REGIONNAME] a [REGIONPOS], obteve permissão para: [PERMISSIONS].
+  </string>
+  <string name="ScriptQuestionCautionChatDenied">
+	&apos;[OBJECTNAME]&apos;, um objeto de  &apos;[OWNERNAME]&apos;, localizado em [REGIONNAME] a [REGIONPOS], teve permissão negada para: [PERMISSIONS].
+  </string>
+  <string name="ScriptTakeMoney">
+	Tomar linden dólares (L$) de você
+  </string>
+  <string name="ActOnControlInputs">
+	Atue nas suas entradas de controle
+  </string>
+  <string name="RemapControlInputs">
+	Remapeie suas entradas de controle
+  </string>
+  <string name="AnimateYourAvatar">
+	Faça uma animação para o seu avatar
+  </string>
+  <string name="AttachToYourAvatar">
+	Anexe ao seu avatar
+  </string>
+  <string name="ReleaseOwnership">
+	Libere a propriedade e torne-a pública
+  </string>
+  <string name="LinkAndDelink">
+	Una e desuna de outros objetos
+  </string>
+  <string name="AddAndRemoveJoints">
+	Adicione e remova junções com outros objetos
+  </string>
+  <string name="ChangePermissions">
+	Modifique as permissões
+  </string>
+  <string name="TrackYourCamera">
+	Acompanhe sua câmera
+  </string>
+  <string name="ControlYourCamera">
+	Controle sua camera
+  </string>
 	<layout_stack name="panels">
 		<layout_panel name="im_contents_panel">
 			<combo_box label="Gestos" name="Gesture">

Modified: projects/2009/http-texture/indra/newview/skins/default/xui/pt/panel_preferences_audio.xml
===================================================================
--- projects/2009/http-texture/indra/newview/skins/default/xui/pt/panel_preferences_audio.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/skins/default/xui/pt/panel_preferences_audio.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -18,6 +18,6 @@
 	<slider label="Efeito Doppler" name="Doppler Effect"/>
 	<slider label="Fator Distância" name="Distance Factor"/>
 	<slider label="Fator Rolloff" name="Rolloff Factor"/>
-	<spinner label="Mudar nível de alerta de L$" name="L$ Change Threshold"/>
-	<spinner label="Mudar nível de alerta de Saúde" name="Health Change Threshold"/>
+	<spinner label="Mudar nível de alerta de L$" name="L$ Change Threshold" label_width="165" width="229"/>
+	<spinner label="Mudar nível de alerta de Saúde" name="Health Change Threshold" label_width="165" width="229"/>
 </panel>

Modified: projects/2009/http-texture/indra/newview/skins/default/xui/ru/floater_about.xml
===================================================================
--- projects/2009/http-texture/indra/newview/skins/default/xui/ru/floater_about.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/skins/default/xui/ru/floater_about.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="About Second Life">
-	<text_editor name="credits_editor">
-		
-	</text_editor>
 	
 </floater>

Modified: projects/2009/http-texture/indra/newview/skins/default/xui/ru/floater_chat_history.xml
===================================================================
--- projects/2009/http-texture/indra/newview/skins/default/xui/ru/floater_chat_history.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/skins/default/xui/ru/floater_chat_history.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -21,6 +21,45 @@
 	<string name="IM_end_log_string">
 		-- Конец Лога --
 	</string>
+  <string name="ScriptQuestionCautionChatGranted">
+	&apos;[OBJECTNAME]&apos;, объект принадлежащий &apos;[OWNERNAME]&apos;,находящийся в [REGIONNAME] at [REGIONPOS], получил разрешения: [PERMISSIONS].
+  </string>
+  <string name="ScriptQuestionCautionChatDenied">
+	&apos;[OBJECTNAME]&apos;, объект принадлежащий &apos;[OWNERNAME]&apos;, находящийся в [REGIONNAME] at [REGIONPOS], потерял разрешения: [PERMISSIONS].
+  </string>
+  <string name="ScriptTakeMoney">
+	Получить с Вас Линден-доллары (L$)
+  </string>
+  <string name="ActOnControlInputs">
+	Работать на Ваших клавишах
+  </string>
+  <string name="RemapControlInputs">
+	Перенастроить управление
+  </string>
+  <string name="AnimateYourAvatar">
+	Анимировать Ваш аватар
+  </string>
+  <string name="AttachToYourAvatar">
+	Прикрепить к Вашему аватару
+  </string>
+  <string name="ReleaseOwnership">
+	Убрать из собственности и сделать достоянием общественности
+  </string>
+  <string name="LinkAndDelink">
+	Соединить/отсоединить от других объектов
+  </string>
+  <string name="AddAndRemoveJoints">
+	Добавьте и удалите соединения с другими объектами
+  </string>
+  <string name="ChangePermissions">
+	Изменить его права
+  </string>
+  <string name="TrackYourCamera">
+	Слежение за Вашей камерой
+  </string>
+  <string name="ControlYourCamera">
+	Управление Вашей камерой
+  </string>
 	<layout_stack name="panels">
 		<layout_panel name="im_contents_panel">
 			<combo_box label="Жесты" name="Gesture">

Modified: projects/2009/http-texture/indra/newview/skins/default/xui/uk/floater_chat_history.xml
===================================================================
--- projects/2009/http-texture/indra/newview/skins/default/xui/uk/floater_chat_history.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/skins/default/xui/uk/floater_chat_history.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -21,6 +21,45 @@
 	<string name="IM_end_log_string">
 		-- Кінець Лога --
 	</string>
+  <string name="ScriptQuestionCautionChatGranted">
+	&apos;[OBJECTNAME]&apos;, об&apos;єкт , що належить &apos;[OWNERNAME]&apos; і знаходиться в [REGIONNAME] at [REGIONPOS], отримав дозволи: [PERMISSIONS].
+  </string>
+  <string name="ScriptQuestionCautionChatDenied">
+	&apos;[OBJECTNAME]&apos;, об&apos;єкт , що належить &apos;[OWNERNAME]&apos;, і знаходиться в [REGIONNAME] at [REGIONPOS], втратив дозволи: [PERMISSIONS].
+  </string>
+  <string name="ScriptTakeMoney">
+	Отримати з Вас Лінден-долари (L$)
+  </string>
+  <string name="ActOnControlInputs">
+	Працювати на Ваших кнопках
+  </string>
+  <string name="RemapControlInputs">
+	Перенастроїти управління
+  </string>
+  <string name="AnimateYourAvatar">
+	Анімувати Ваш аватар
+  </string>
+  <string name="AttachToYourAvatar">
+	Прикріпити до Вашого аватара
+  </string>
+  <string name="ReleaseOwnership">
+	Прибрати з власності і зробити публічним
+  </string>
+  <string name="LinkAndDelink">
+	Під&apos;єднати/від&apos;єднати від інших об&apos;єктів
+  </string>
+  <string name="AddAndRemoveJoints">
+	Додайте і видаліть з&apos;єднання з іншими об&apos;єктами
+  </string>
+  <string name="ChangePermissions">
+	Змінити його права
+  </string>
+  <string name="TrackYourCamera">
+	Стеження за Вашою камерою
+  </string>
+  <string name="ControlYourCamera">
+	Управління Вашою камерою
+  </string>
 	<layout_stack name="panels">
 		<layout_panel name="im_contents_panel">
 			<combo_box label="Жести" name="Gesture">

Modified: projects/2009/http-texture/indra/newview/skins/default/xui/zh/floater_about.xml
===================================================================
--- projects/2009/http-texture/indra/newview/skins/default/xui/zh/floater_about.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/skins/default/xui/zh/floater_about.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -22,6 +22,7 @@
   SSLeay Copyright © 1995-1998 Eric Young (eay at cryptsoft.com)
   xmlrpc-epi Copyright © 2000 Epinions, Inc.
   zlib Copyright © 1995-2002 Jean-loup Gailly and Mark Adler.
+  google-perftools Copyright (c) 2005, Google Inc.
 
   All rights reserved.  查看licenses.txt获取细节.
 

Modified: projects/2009/http-texture/indra/newview/skins/default/xui/zh/floater_chat_history.xml
===================================================================
--- projects/2009/http-texture/indra/newview/skins/default/xui/zh/floater_chat_history.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/indra/newview/skins/default/xui/zh/floater_chat_history.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -18,6 +18,45 @@
 	<string name="IM_end_log_string">
 		-- 日志结束 --
 	</string>
+  <string name="ScriptQuestionCautionChatGranted">
+	‘[OBJECTNAME]’, 主人为 ‘[OWNERNAME]’ 的物体, 位于 [REGIONNAME] 地区  [REGIONPOS], 已被授予以下权利: [PERMISSIONS]。
+  </string>
+  <string name="ScriptQuestionCautionChatDenied">
+	‘[OBJECTNAME]’, 主人为 ‘[OWNERNAME]’ 的物体, 位于 [REGIONNAME] 地区  [REGIONPOS], 已被拒绝以下权利: [PERMISSIONS]。
+  </string>
+  <string name="ScriptTakeMoney">
+	从您那里取走林登币(L$)
+  </string>
+  <string name="ActOnControlInputs">
+	对您的控制输入做出反应
+  </string>
+  <string name="RemapControlInputs">
+	重新布置你的控制按键
+  </string>
+  <string name="AnimateYourAvatar">
+	在您的化身上播放动画
+  </string>
+  <string name="AttachToYourAvatar">
+	装备到您的身上
+  </string>
+  <string name="ReleaseOwnership">
+	放弃主人权利并成为公众物品
+  </string>
+  <string name="LinkAndDelink">
+	建立或解除与其他物品的链接
+  </string>
+  <string name="AddAndRemoveJoints">
+	添加或移除与其他物体之间的连接点
+  </string>
+  <string name="ChangePermissions">
+	更改其许可权利
+  </string>
+  <string name="TrackYourCamera">
+	追踪您的视角
+  </string>
+  <string name="ControlYourCamera">
+	控制您的视角
+  </string>
 	<layout_stack name="panels">
 		<layout_panel min_width="275" name="im_contents_panel">
 			<combo_box label="动作" name="Gesture">

Modified: projects/2009/http-texture/install.xml
===================================================================
--- projects/2009/http-texture/install.xml	2009-05-07 22:31:48 UTC (rev 2229)
+++ projects/2009/http-texture/install.xml	2009-05-08 00:30:22 UTC (rev 2230)
@@ -731,6 +731,33 @@
           </map>
         </map>
       </map>
+      <key>libopenmetaverse</key>
+      <map>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>2e5fb311d9de8714f352cf9448fa4e04</string>
+            <key>url</key>
+            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/libopenmetaverse-0.6.1.1-darwin-20090429.tar.bz2</uri>
+          </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>2e5fb311d9de8714f352cf9448fa4e04</string>
+            <key>url</key>
+            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/libopenmetaverse-0.6.1.1-linux64-20090429.tar.bz2</uri>
+          </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>2e5fb311d9de8714f352cf9448fa4e04</string>
+            <key>url</key>
+            <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/libopenmetaverse-0.6.1.1-windows-20090429.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
       <key>libpng</key>
       <map>
         <key>copyright</key>



More information about the sldev-commits mailing list