Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui

237 files changed, 6761 insertions, 3671 deletions

diff --git a/.hgtags b/.hgtags
index 216066ea00..e3edb9f17e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -184,6 +184,15 @@ f2412ecd6740803ea9452f1d17fd872e263a0df7 3.0.2-start
 e5c9af2d7980a99a71650be3a0cf7b2b3c3b897e DRTVWR-86_3.0.2-beta2
 e5c9af2d7980a99a71650be3a0cf7b2b3c3b897e 3.0.2-beta2
 b95ddac176ac944efdc85cbee94ac2e1eab44c79 3.0.3-start
+1778f26b6d0ae762dec3ca37140f66620f2485d9 DRTVWR-78_3.0.0-release
+0000000000000000000000000000000000000000 DRTVWR-78_3.0.0-release
+1778f26b6d0ae762dec3ca37140f66620f2485d9 DRTVWR-77_3.0.0-release
 6694f3f062aa45f64ab391d25a3eb3d5eb1b0871 DRTVWR-85_3.0.3-beta1
-586907287be581817b2422b5137971b22d54ea48 3.0.4-start
 6694f3f062aa45f64ab391d25a3eb3d5eb1b0871 3.0.3-beta1
+586907287be581817b2422b5137971b22d54ea48 3.0.4-start
+61aa7974df089e8621fe9a4c69bcdefdb3cc208a DRTVWR-89_3.0.3-beta2
+61aa7974df089e8621fe9a4c69bcdefdb3cc208a 3.0.3-beta2
+0496d2f74043cf4e6058e76ac3db03d44cff42ce DRTVWR-84_3.0.3-release
+0496d2f74043cf4e6058e76ac3db03d44cff42ce 3.0.3-release
+92a3aa04775438226399b19deee12ac3b5a62838 3.0.5-start
+c7282e59f374ee904bd793c3c444455e3399b0c5 3.1.0-start
diff --git a/autobuild.xml b/autobuild.xml
index 347ef419ed..9a68a70470 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1206,9 +1206,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>9cd66e879908f047d9af665b92946ecc</string>
+              <string>1b92a69f5eba7cd8b017180659076db5</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/239803/arch/Darwin/installer/llqtwebkit-4.7.1-darwin-20110830.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/roxie_3p-llqtwebkit/rev/242182/arch/Darwin/installer/llqtwebkit-4.7.1-darwin-20111003.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin</string>
@@ -1230,9 +1230,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>ab9393795515cbbe9526bde33b41bf2a</string>
+              <string>1e7f24b69b0fc751c7e86efe7c621882</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-llqtwebkit/rev/239670/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20110829.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/roxie_3p-llqtwebkit/rev/242182/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20111003.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake
index 5982ee9a49..2704912eb5 100644
--- a/indra/cmake/OpenSSL.cmake
+++ b/indra/cmake/OpenSSL.cmake
@@ -11,7 +11,7 @@ else (STANDALONE)
   if (WINDOWS)
     set(OPENSSL_LIBRARIES ssleay32 libeay32)
   else (WINDOWS)
-    set(OPENSSL_LIBRARIES ssl)
+    set(OPENSSL_LIBRARIES ssl crypto)
   endif (WINDOWS)
   set(OPENSSL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 endif (STANDALONE)
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 60d4cfe6d3..6f39aba976 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -117,7 +117,7 @@ set(llcommon_HEADER_FILES
     indra_constants.h
     linden_common.h
     linked_lists.h
-    llaccountingquota.h
+    llaccountingcost.h
     llallocator.h
     llallocator_heap_profile.h
     llagentconstants.h
diff --git a/indra/llcommon/llaccountingquota.h b/indra/llcommon/llaccountingcost.h
index 140333de07..0ef3b50c6d 100644
--- a/indra/llcommon/llaccountingquota.h
+++ b/indra/llcommon/llaccountingcost.h
@@ -1,5 +1,5 @@
 /** 
- * @file llaccountingquota.h
+ * @file llaccountingcost.h
  * @
  *
  * $LicenseInfo:firstyear=2001&license=viewerlgpl$
@@ -58,22 +58,28 @@ struct ParcelQuota
 	F32 mParcelCapacity;
 };
 
-struct SelectionQuota
+//SelectionQuota atm does not require a id
+struct SelectionCost
 {
-	SelectionQuota( LLUUID localId, F32 renderCost, F32 physicsCost, F32 networkCost, F32 simulationCost )
-	: mLocalId( localId)
-	, mRenderCost( renderCost )
-	, mPhysicsCost( physicsCost )
+	SelectionCost( /*LLTransactionID transactionId, */ F32 physicsCost, F32 networkCost, F32 simulationCost )
+	//: mTransactionId( transactionId)
+	: mPhysicsCost( physicsCost )
 	, mNetworkCost( networkCost )
 	, mSimulationCost( simulationCost )
 	{
 	}
-	SelectionQuota() {}
+	SelectionCost()
+	: mPhysicsCost( 0.0f )
+	, mNetworkCost( 0.0f )
+	, mSimulationCost( 0.0f )
+	{}
 	
-	F32 mRenderCost, mPhysicsCost, mNetworkCost, mSimulationCost;	
-	LLUUID mLocalId;
+	F32 mPhysicsCost, mNetworkCost, mSimulationCost;	
+	//LLTransactionID mTransactionId;
 };
 
+typedef enum { Roots = 0 , Prims } eSelectionType;
+
 #endif
 
 
diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp
index 8c02ad8290..3b27a1639a 100644
--- a/indra/llcommon/llmemory.cpp
+++ b/indra/llcommon/llmemory.cpp
@@ -165,33 +165,60 @@ void LLMemory::logMemoryInfo(BOOL update)
 	llinfos << "Current allocated page size (KB): " << sAllocatedPageSizeInKB << llendl ;
 	llinfos << "Current availabe physical memory(KB): " << sAvailPhysicalMemInKB << llendl ;
 	llinfos << "Current max usable memory(KB): " << sMaxPhysicalMemInKB << llendl ;
+
+	llinfos << "--- private pool information -- " << llendl ;
+	llinfos << "Total reserved (KB): " << LLPrivateMemoryPoolManager::getInstance()->mTotalReservedSize / 1024 << llendl ;
+	llinfos << "Total allocated (KB): " << LLPrivateMemoryPoolManager::getInstance()->mTotalAllocatedSize / 1024 << llendl ;
 }
 
 //return 0: everything is normal;
 //return 1: the memory pool is low, but not in danger;
 //return -1: the memory pool is in danger, is about to crash.
 //static 
-S32 LLMemory::isMemoryPoolLow()
+bool LLMemory::isMemoryPoolLow()
 {
 	static const U32 LOW_MEMEOY_POOL_THRESHOLD_KB = 64 * 1024 ; //64 MB for emergency use
+	const static U32 MAX_SIZE_CHECKED_MEMORY_BLOCK = 64 * 1024 * 1024 ; //64 MB
+	static void* last_reserved_address = NULL ;
 
 	if(!sEnableMemoryFailurePrevention)
 	{
-		return 0 ; //no memory failure prevention.
+		return false ; //no memory failure prevention.
 	}
 
 	if(sAvailPhysicalMemInKB < (LOW_MEMEOY_POOL_THRESHOLD_KB >> 2)) //out of physical memory
 	{
-		return -1 ;
+		return true ;
 	}
 
 	if(sAllocatedPageSizeInKB + (LOW_MEMEOY_POOL_THRESHOLD_KB >> 2) > sMaxHeapSizeInKB) //out of virtual address space.
 	{
-		return -1 ;
+		return true ;
 	}
 
-	return (S32)(sAvailPhysicalMemInKB < LOW_MEMEOY_POOL_THRESHOLD_KB || 
+	bool is_low = (S32)(sAvailPhysicalMemInKB < LOW_MEMEOY_POOL_THRESHOLD_KB || 
 		sAllocatedPageSizeInKB + LOW_MEMEOY_POOL_THRESHOLD_KB > sMaxHeapSizeInKB) ;
+
+	//check the virtual address space fragmentation
+	if(!is_low)
+	{
+		if(!last_reserved_address)
+		{
+			last_reserved_address = LLMemory::tryToAlloc(last_reserved_address, MAX_SIZE_CHECKED_MEMORY_BLOCK) ;
+		}
+		else
+		{
+			last_reserved_address = LLMemory::tryToAlloc(last_reserved_address, MAX_SIZE_CHECKED_MEMORY_BLOCK) ;
+			if(!last_reserved_address) //failed, try once more
+			{
+				last_reserved_address = LLMemory::tryToAlloc(last_reserved_address, MAX_SIZE_CHECKED_MEMORY_BLOCK) ;
+			}
+		}
+
+		is_low = !last_reserved_address ; //allocation failed
+	}
+
+	return is_low ;
 }
 
 //static 
@@ -1289,15 +1316,13 @@ U16 LLPrivateMemoryPool::LLMemoryChunk::getPageLevel(U32 size)
 //--------------------------------------------------------------------
 const U32 CHUNK_SIZE = 4 << 20 ; //4 MB
 const U32 LARGE_CHUNK_SIZE = 4 * CHUNK_SIZE ; //16 MB
-LLPrivateMemoryPool::LLPrivateMemoryPool(S32 type) :
+LLPrivateMemoryPool::LLPrivateMemoryPool(S32 type, U32 max_pool_size) :
 	mMutexp(NULL),	
 	mReservedPoolSize(0),
 	mHashFactor(1),
-	mType(type)
+	mType(type),
+	mMaxPoolSize(max_pool_size)
 {
-	const U32 MAX_POOL_SIZE = 256 * 1024 * 1024 ; //256 MB
-
-	mMaxPoolSize = MAX_POOL_SIZE ;
 	if(type == STATIC_THREADED || type == VOLATILE_THREADED)
 	{
 		mMutexp = new LLMutex ;
@@ -1362,16 +1387,31 @@ char* LLPrivateMemoryPool::allocate(U32 size)
 				chunk = chunk->mNext ;
 			}
 		}
-
-		chunk = addChunk(chunk_idx) ;
-		if(chunk)
+		else
 		{
-			p = chunk->allocate(size) ;
+			chunk = addChunk(chunk_idx) ;
+			if(chunk)
+			{
+				p = chunk->allocate(size) ;
+			}
 		}
 	}
 
 	unlock() ;
 
+	if(!p) //to get memory from the private pool failed, try the heap directly
+	{
+		static bool to_log = true ;
+		
+		if(to_log)
+		{
+			llwarns << "The memory pool overflows, now using heap directly!" << llendl ;
+			to_log = false ;
+		}
+
+		return (char*)malloc(size) ;
+	}
+
 	return p ;
 }
 
@@ -1472,7 +1512,7 @@ void  LLPrivateMemoryPool::destroyPool()
 	unlock() ;
 }
 
-void  LLPrivateMemoryPool::checkSize(U32 asked_size)
+bool LLPrivateMemoryPool::checkSize(U32 asked_size)
 {
 	if(mReservedPoolSize + asked_size > mMaxPoolSize)
 	{
@@ -1480,8 +1520,12 @@ void  LLPrivateMemoryPool::checkSize(U32 asked_size)
 		llinfos << "Total reserved size: " << mReservedPoolSize + asked_size << llendl ;
 		llinfos << "Total_allocated Size: " << getTotalAllocatedSize() << llendl ;
 
-		llerrs << "The pool is overflowing..." << llendl ;
+		//llerrs << "The pool is overflowing..." << llendl ;
+
+		return false ;
 	}
+
+	return true ;
 }
 
 LLPrivateMemoryPool::LLMemoryChunk* LLPrivateMemoryPool::addChunk(S32 chunk_index)
@@ -1501,7 +1545,11 @@ LLPrivateMemoryPool::LLMemoryChunk* LLPrivateMemoryPool::addChunk(S32 chunk_inde
 			MAX_SLOT_SIZES[chunk_index], MIN_BLOCK_SIZES[chunk_index], MAX_BLOCK_SIZES[chunk_index]) ;
 	}
 
-	checkSize(preferred_size + overhead) ;
+	if(!checkSize(preferred_size + overhead))
+	{
+		return NULL ;
+	}
+
 	mReservedPoolSize += preferred_size + overhead ;
 
 	char* buffer = (char*)malloc(preferred_size + overhead) ;
@@ -1593,7 +1641,7 @@ LLPrivateMemoryPool::LLMemoryChunk* LLPrivateMemoryPool::findChunk(const char* a
 
 void LLPrivateMemoryPool::addToHashTable(LLMemoryChunk* chunk) 
 {
-	static const U16 HASH_FACTORS[] = {41, 83, 193, 317, 419, 523, 0xFFFF}; 
+	static const U16 HASH_FACTORS[] = {41, 83, 193, 317, 419, 523, 719, 997, 1523, 0xFFFF}; 
 	
 	U16 i ;
 	if(mChunkHashList.empty())
@@ -1774,7 +1822,7 @@ void LLPrivateMemoryPool::LLChunkHashElement::remove(LLPrivateMemoryPool::LLMemo
 //--------------------------------------------------------------------
 LLPrivateMemoryPoolManager* LLPrivateMemoryPoolManager::sInstance = NULL ;
 
-LLPrivateMemoryPoolManager::LLPrivateMemoryPoolManager(BOOL enabled) 
+LLPrivateMemoryPoolManager::LLPrivateMemoryPoolManager(BOOL enabled, U32 max_pool_size) 
 {
 	mPoolList.resize(LLPrivateMemoryPool::MAX_TYPES) ;
 
@@ -1784,6 +1832,9 @@ LLPrivateMemoryPoolManager::LLPrivateMemoryPoolManager(BOOL enabled)
 	}
 
 	mPrivatePoolEnabled = enabled ;
+
+	const U32 MAX_POOL_SIZE = 256 * 1024 * 1024 ; //256 MB
+	mMaxPrivatePoolSize = llmax(max_pool_size, MAX_POOL_SIZE) ;
 }
 
 LLPrivateMemoryPoolManager::~LLPrivateMemoryPoolManager() 
@@ -1826,11 +1877,11 @@ LLPrivateMemoryPoolManager::~LLPrivateMemoryPoolManager()
 }
 
 //static 
-void LLPrivateMemoryPoolManager::initClass(BOOL enabled) 
+void LLPrivateMemoryPoolManager::initClass(BOOL enabled, U32 max_pool_size) 
 {
 	llassert_always(!sInstance) ;
 
-	sInstance = new LLPrivateMemoryPoolManager(enabled) ;
+	sInstance = new LLPrivateMemoryPoolManager(enabled, max_pool_size) ;
 }
 
 //static 
@@ -1862,7 +1913,7 @@ LLPrivateMemoryPool* LLPrivateMemoryPoolManager::newPool(S32 type)
 
 	if(!mPoolList[type])
 	{
-		mPoolList[type] = new LLPrivateMemoryPool(type) ;
+		mPoolList[type] = new LLPrivateMemoryPool(type, mMaxPrivatePoolSize) ;
 	}
 
 	return mPoolList[type] ;
diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h
index db753f0d8b..6967edd7e7 100644
--- a/indra/llcommon/llmemory.h
+++ b/indra/llcommon/llmemory.h
@@ -122,7 +122,7 @@ public:
 	static void initMaxHeapSizeGB(F32 max_heap_size_gb, BOOL prevent_heap_failure);
 	static void updateMemoryInfo() ;
 	static void logMemoryInfo(BOOL update = FALSE);
-	static S32  isMemoryPoolLow();
+	static bool isMemoryPoolLow();
 
 	static U32 getAvailableMemKB() ;
 	static U32 getMaxMemKB() ;
@@ -303,7 +303,7 @@ public:
 	} ;
 
 private:
-	LLPrivateMemoryPool(S32 type) ;
+	LLPrivateMemoryPool(S32 type, U32 max_pool_size) ;
 	~LLPrivateMemoryPool() ;
 
 	char *allocate(U32 size) ;
@@ -320,7 +320,7 @@ private:
 	void unlock() ;	
 	S32 getChunkIndex(U32 size) ;
 	LLMemoryChunk*  addChunk(S32 chunk_index) ;
-	void checkSize(U32 asked_size) ;
+	bool checkSize(U32 asked_size) ;
 	void removeChunk(LLMemoryChunk* chunk) ;
 	U16  findHashKey(const char* addr);
 	void addToHashTable(LLMemoryChunk* chunk) ;
@@ -383,12 +383,12 @@ private:
 class LL_COMMON_API LLPrivateMemoryPoolManager
 {
 private:
-	LLPrivateMemoryPoolManager(BOOL enabled) ;
+	LLPrivateMemoryPoolManager(BOOL enabled, U32 max_pool_size) ;
 	~LLPrivateMemoryPoolManager() ;
 
 public:	
 	static LLPrivateMemoryPoolManager* getInstance() ;
-	static void initClass(BOOL enabled) ;
+	static void initClass(BOOL enabled, U32 pool_size) ;
 	static void destroyClass() ;
 
 	LLPrivateMemoryPool* newPool(S32 type) ;
@@ -398,6 +398,7 @@ private:
 	static LLPrivateMemoryPoolManager* sInstance ;
 	std::vector<LLPrivateMemoryPool*> mPoolList ;
 	BOOL mPrivatePoolEnabled;
+	U32  mMaxPrivatePoolSize;
 
 public:
 	//debug and statistics info.
diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h
index c732e3bc77..b631b96252 100644
--- a/indra/llcommon/llthread.h
+++ b/indra/llcommon/llthread.h
@@ -195,7 +195,8 @@ public:
 	}
 	~LLMutex()
 	{
-		llassert(!isLocked()); // better not be locked!
+		//this assertion erroneously triggers whenever an LLCondition is destroyed
+		//llassert(!isLocked()); // better not be locked!
 		apr_thread_mutex_destroy(mAPRMutexp);
 		mAPRMutexp = NULL;
 	}
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index ef55cfec89..e4ad7f4f54 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -28,8 +28,8 @@
 #define LL_LLVERSIONVIEWER_H
 
 const S32 LL_VERSION_MAJOR = 3;
-const S32 LL_VERSION_MINOR = 0;
-const S32 LL_VERSION_PATCH = 5;
+const S32 LL_VERSION_MINOR = 1;
+const S32 LL_VERSION_PATCH = 1;
 const S32 LL_VERSION_BUILD = 0;
 
 const char * const LL_CHANNEL = "Second Life Developer";
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp
index c95f922301..433076c7a9 100644
--- a/indra/llinventory/llparcel.cpp
+++ b/indra/llinventory/llparcel.cpp
@@ -1373,12 +1373,3 @@ LLParcel::ECategory category_ui_string_to_category(const std::string& s)
     // is a distinct option from "None" and "Other"
     return LLParcel::C_ANY;
 }
-
-void LLParcel::updateQuota( const LLUUID& objectId,  const ParcelQuota& quota )
-{
-	if ( mID == objectId )
-	{
-		mQuota = quota;
-	}
-}
-
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h
index ff35caab4c..e36d0b20d2 100644
--- a/indra/llinventory/llparcel.h
+++ b/indra/llinventory/llparcel.h
@@ -34,7 +34,6 @@
 #include "llpermissions.h"
 #include "lltimer.h"
 #include "v3math.h"
-#include "llaccountingquota.h"
 
 // Grid out of which parcels taken is stepped every 4 meters.
 const F32 PARCEL_GRID_STEP_METERS	= 4.f;
@@ -603,9 +602,6 @@ public:
 	BOOL	getSellWithObjects() const		{ return (mParcelFlags & PF_SELL_PARCEL_OBJECTS) ? TRUE : FALSE; }
 	
 	
-			void		 updateQuota( const LLUUID& objectId, const ParcelQuota& quota );
-	const	ParcelQuota& getQuota( void ) { return mQuota; }	
-	
 protected:
 	LLUUID mID;
 	LLUUID				mOwnerID;
@@ -681,7 +677,6 @@ protected:
 	BOOL				mAllowGroupAVSounds;
 	BOOL				mAllowAnyAVSounds;
 	
-	ParcelQuota			mQuota;
 	
 public:
 	// HACK, make private
diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h
index eea7c977fb..9297bcbac2 100644
--- a/indra/llmath/llmath.h
+++ b/indra/llmath/llmath.h
@@ -510,6 +510,13 @@ inline void ll_remove_outliers(std::vector<VEC_TYPE>& data, F32 k)
 	VEC_TYPE Q1 = data[data.size()/4];
 	VEC_TYPE Q3 = data[data.size()-data.size()/4-1];
 
+	if ((F32)(Q3-Q1) < 1.f)
+	{
+		// not enough variation to detect outliers
+		return;
+	}
+
+
 	VEC_TYPE min = (VEC_TYPE) ((F32) Q1-k * (F32) (Q3-Q1));
 	VEC_TYPE max = (VEC_TYPE) ((F32) Q3+k * (F32) (Q3-Q1));
 
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index 2893e746e9..1a95f9cd46 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -2078,7 +2078,7 @@ LLVolume::LLVolume(const LLVolumeParams &params, const F32 detail, const BOOL ge
 	mFaceMask = 0x0;
 	mDetail = detail;
 	mSculptLevel = -2;
-	mIsTetrahedron = FALSE;
+	mIsMeshAssetLoaded = FALSE;
 	mLODScaleBias.setVec(1,1,1);
 	mHullPoints = NULL;
 	mHullIndices = NULL;
@@ -2100,7 +2100,7 @@ LLVolume::LLVolume(const LLVolumeParams &params, const F32 detail, const BOOL ge
 
 	generate();
 	
-	if (mParams.getSculptID().isNull() && mParams.getSculptType() == LL_SCULPT_TYPE_NONE)
+	if (mParams.getSculptID().isNull() && mParams.getSculptType() == LL_SCULPT_TYPE_NONE || mParams.getSculptType() == LL_SCULPT_TYPE_MESH)
 	{
 		createVolumeFaces();
 	}
@@ -2408,7 +2408,7 @@ bool LLVolume::unpackVolumeFaces(std::istream& is, S32 size)
 	LLSD mdl;
 	if (!unzip_llsd(mdl, is, size))
 	{
-		llwarns << "not a valid mesh asset!" << llendl;
+		LL_DEBUGS("MeshStreaming") << "Failed to unzip LLSD blob for LoD, will probably fetch from sim again." << llendl;
 		return false;
 	}
 	
@@ -2706,173 +2706,21 @@ bool LLVolume::unpackVolumeFaces(std::istream& is, S32 size)
 	return true;
 }
 
-void tetrahedron_set_normal(LLVolumeFace::VertexData* cv)
-{
-	LLVector4a v0;
-	v0.setSub(cv[1].getPosition(), cv[0].getNormal());
-	LLVector4a v1;
-	v1.setSub(cv[2].getNormal(), cv[0].getPosition());
-	
-	cv[0].getNormal().setCross3(v0,v1);
-	cv[0].getNormal().normalize3fast();
-	cv[1].setNormal(cv[0].getNormal());
-	cv[2].setNormal(cv[1].getNormal());
-}
 
-BOOL LLVolume::isTetrahedron()
+BOOL LLVolume::isMeshAssetLoaded()
 {
-	return mIsTetrahedron;
+	return mIsMeshAssetLoaded;
 }
 
-void LLVolume::makeTetrahedron()
+void LLVolume::setMeshAssetLoaded(BOOL loaded)
 {
-	mVolumeFaces.clear();
-
-	LLVolumeFace face;
-
-	F32 x = 0.25f;
-	LLVector4a p[] = 
-	{ //unit tetrahedron corners
-		LLVector4a(x,x,x),
-		LLVector4a(-x,-x,x),
-		LLVector4a(-x,x,-x),
-		LLVector4a(x,-x,-x)
-	};
-
-	face.mExtents[0].splat(-x);
-	face.mExtents[1].splat(x);
-	
-	LLVolumeFace::VertexData cv[3];
-
-	//set texture coordinates
-	cv[0].mTexCoord = LLVector2(0,0);
-	cv[1].mTexCoord = LLVector2(1,0);
-	cv[2].mTexCoord = LLVector2(0.5f, 0.5f*F_SQRT3);
-
-
-	//side 1
-	cv[0].setPosition(p[1]);
-	cv[1].setPosition(p[0]);
-	cv[2].setPosition(p[2]);
-
-	tetrahedron_set_normal(cv);
-
-	face.resizeVertices(12);
-	face.resizeIndices(12);
-
-	LLVector4a* v = (LLVector4a*) face.mPositions;
-	LLVector4a* n = (LLVector4a*) face.mNormals;
-	LLVector2* tc = (LLVector2*) face.mTexCoords;
-
-	v[0] = cv[0].getPosition();
-	v[1] = cv[1].getPosition();
-	v[2] = cv[2].getPosition();
-	v += 3;
-
-	n[0] = cv[0].getNormal();
-	n[1] = cv[1].getNormal();
-	n[2] = cv[2].getNormal();
-	n += 3;
-
-	if(tc)
-	{
-		tc[0] = cv[0].mTexCoord;
-		tc[1] = cv[1].mTexCoord;
-		tc[2] = cv[2].mTexCoord;
-		tc += 3;
-	}
-	
-	//side 2
-	cv[0].setPosition(p[3]);
-	cv[1].setPosition(p[0]);
-	cv[2].setPosition(p[1]);
-
-	tetrahedron_set_normal(cv);
-
-	v[0] = cv[0].getPosition();
-	v[1] = cv[1].getPosition();
-	v[2] = cv[2].getPosition();
-	v += 3;
-
-	n[0] = cv[0].getNormal();
-	n[1] = cv[1].getNormal();
-	n[2] = cv[2].getNormal();
-	n += 3;
-
-	if(tc)
-	{
-		tc[0] = cv[0].mTexCoord;
-		tc[1] = cv[1].mTexCoord;
-		tc[2] = cv[2].mTexCoord;
-		tc += 3;
-	}
-
-	//side 3
-	cv[0].setPosition(p[3]);
-	cv[1].setPosition(p[1]);
-	cv[2].setPosition(p[2]);
-
-	tetrahedron_set_normal(cv);
-
-	v[0] = cv[0].getPosition();
-	v[1] = cv[1].getPosition();
-	v[2] = cv[2].getPosition();
-	v += 3;
-
-	n[0] = cv[0].getNormal();
-	n[1] = cv[1].getNormal();
-	n[2] = cv[2].getNormal();
-	n += 3;
-
-	if(tc)
-	{
-		tc[0] = cv[0].mTexCoord;
-		tc[1] = cv[1].mTexCoord;
-		tc[2] = cv[2].mTexCoord;
-		tc += 3;
-	}
-	
-	//side 4
-	cv[0].setPosition(p[2]);
-	cv[1].setPosition(p[0]);
-	cv[2].setPosition(p[3]);
-
-	tetrahedron_set_normal(cv);
-
-	v[0] = cv[0].getPosition();
-	v[1] = cv[1].getPosition();
-	v[2] = cv[2].getPosition();
-	v += 3;
-
-	n[0] = cv[0].getNormal();
-	n[1] = cv[1].getNormal();
-	n[2] = cv[2].getNormal();
-	n += 3;
-
-	if(tc)
-	{
-		tc[0] = cv[0].mTexCoord;
-		tc[1] = cv[1].mTexCoord;
-		tc[2] = cv[2].mTexCoord;
-		tc += 3;
-	}
-	
-	//set index buffer
-	for (U16 i = 0; i < 12; i++)
-	{
-		face.mIndices[i] = i;
-	}
-	
-	mVolumeFaces.push_back(face);
-	mSculptLevel = 0;
-	mIsTetrahedron = TRUE;
+	mIsMeshAssetLoaded = loaded;
 }
 
 void LLVolume::copyVolumeFaces(const LLVolume* volume)
 {
 	mVolumeFaces = volume->mVolumeFaces;
 	mSculptLevel = 0;
-	mIsTetrahedron = FALSE;
 }
 
 void LLVolume::cacheOptimize()
@@ -2886,14 +2734,7 @@ void LLVolume::cacheOptimize()
 
 S32	LLVolume::getNumFaces() const
 {
-	U8 sculpt_type = (mParams.getSculptType() & LL_SCULPT_TYPE_MASK);
-
-	if (sculpt_type == LL_SCULPT_TYPE_MESH)
-	{
-		return LL_SCULPT_MESH_MAX_FACES;
-	}
-
-	return (S32)mProfilep->mFaces.size();
+	return mIsMeshAssetLoaded ? getNumVolumeFaces() : (S32)mProfilep->mFaces.size();
 }
 
 
@@ -7269,7 +7110,7 @@ BOOL LLVolumeFace::createSide(LLVolume* volume, BOOL partial_build)
 		resizeVertices(num_vertices);
 		resizeIndices(num_indices);
 
-		if ((volume->getParams().getSculptType() & LL_SCULPT_TYPE_MASK) != LL_SCULPT_TYPE_MESH)
+		if (!volume->isMeshAssetLoaded())
 		{
 			mEdge.resize(num_indices);
 		}
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h
index f67f8f644d..f0e59a3c00 100644
--- a/indra/llmath/llvolume.h
+++ b/indra/llmath/llvolume.h
@@ -1058,14 +1058,14 @@ protected:
 public:
 	virtual bool unpackVolumeFaces(std::istream& is, S32 size);
 
-	virtual void makeTetrahedron();
-	virtual BOOL isTetrahedron();
+	virtual void setMeshAssetLoaded(BOOL loaded);
+	virtual BOOL isMeshAssetLoaded();
 
  protected:
 	BOOL mUnique;
 	F32 mDetail;
 	S32 mSculptLevel;
-	BOOL mIsTetrahedron;
+	BOOL mIsMeshAssetLoaded;
 	
 	LLVolumeParams mParams;
 	LLPath *mPathp;
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp
index 14e169c6b1..6d9213f51b 100644
--- a/indra/llmessage/llcurl.cpp
+++ b/indra/llmessage/llcurl.cpp
@@ -222,7 +222,7 @@ namespace boost
 std::set<CURL*> LLCurl::Easy::sFreeHandles;
 std::set<CURL*> LLCurl::Easy::sActiveHandles;
 LLMutex* LLCurl::Easy::sHandleMutex = NULL;
-
+LLMutex* LLCurl::Easy::sMultiMutex = NULL;
 
 //static
 CURL* LLCurl::Easy::allocEasyHandle()
@@ -553,6 +553,11 @@ LLCurl::Multi::~Multi()
 {
 	llassert(isStopped());
 
+	if (LLCurl::sMultiThreaded)
+	{
+		LLCurl::Easy::sMultiMutex->lock();
+	}
+
 	delete mSignal;
 	mSignal = NULL;
 
@@ -573,6 +578,11 @@ LLCurl::Multi::~Multi()
 
 	check_curl_multi_code(curl_multi_cleanup(mCurlMultiHandle));
 	--gCurlMultiCount;
+
+	if (LLCurl::sMultiThreaded)
+	{
+		LLCurl::Easy::sMultiMutex->unlock();
+	}
 }
 
 CURLMsg* LLCurl::Multi::info_read(S32* msgs_in_queue)
@@ -606,6 +616,7 @@ void LLCurl::Multi::run()
 		mPerformState = PERFORM_STATE_PERFORMING;
 		if (!mQuitting)
 		{
+			LLMutexLock lock(LLCurl::Easy::sMultiMutex);
 			doPerform();
 		}
 	}
@@ -1179,6 +1190,7 @@ void LLCurl::initClass(bool multi_threaded)
 	check_curl_code(code);
 	
 	Easy::sHandleMutex = new LLMutex();
+	Easy::sMultiMutex = new LLMutex();
 
 #if SAFE_SSL
 	S32 mutex_count = CRYPTO_num_locks();
@@ -1200,6 +1212,8 @@ void LLCurl::cleanupClass()
 
 	delete Easy::sHandleMutex;
 	Easy::sHandleMutex = NULL;
+	delete Easy::sMultiMutex;
+	Easy::sMultiMutex = NULL;
 
 	for (std::set<CURL*>::iterator iter = Easy::sFreeHandles.begin(); iter != Easy::sFreeHandles.end(); ++iter)
 	{
diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h
index 213b281e72..87de202717 100644
--- a/indra/llmessage/llcurl.h
+++ b/indra/llmessage/llcurl.h
@@ -232,6 +232,7 @@ public:
 
 private:
 	friend class LLCurl;
+	friend class LLCurl::Multi;
 
 	CURL*				mCurlEasyHandle;
 	struct curl_slist*	mHeaders;
@@ -251,6 +252,7 @@ private:
 	static std::set<CURL*> sFreeHandles;
 	static std::set<CURL*> sActiveHandles;
 	static LLMutex* sHandleMutex;
+	static LLMutex* sMultiMutex;
 };
 
 class LLCurl::Multi : public LLThread
diff --git a/indra/llprimitive/llmaterialtable.cpp b/indra/llprimitive/llmaterialtable.cpp
index 99f32e4109..b4539ebee9 100644
--- a/indra/llprimitive/llmaterialtable.cpp
+++ b/indra/llprimitive/llmaterialtable.cpp
@@ -538,7 +538,7 @@ std::string LLMaterialTable::getName(U8 mcode)
 		}
 	}
 
-	return NULL;
+	return std::string();
 }
 
 
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index 434fb7650b..6e4bb7ec97 100644
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -1679,6 +1679,19 @@ LLSD LLModel::writeModelToStream(std::ostream& ostr, LLSD& mdl, BOOL nowrite, BO
 
 LLModel::weight_list& LLModel::getJointInfluences(const LLVector3& pos)
 {
+	//1. If a vertex has been weighted then we'll find it via pos and return it's weight list
+	weight_map::iterator iterPos = mSkinWeights.begin();
+	weight_map::iterator iterEnd = mSkinWeights.end();
+	
+	for ( ; iterPos!=iterEnd; ++iterPos )
+	{
+		if ( jointPositionalLookup( iterPos->first, pos ) )
+		{
+			return iterPos->second;
+		}
+	}
+	
+	//2. Otherwise we'll use the older implementation
 	weight_map::iterator iter = mSkinWeights.find(pos);
 	
 	if (iter != mSkinWeights.end())
@@ -1692,13 +1705,13 @@ LLModel::weight_list& LLModel::getJointInfluences(const LLVector3& pos)
 	}
 	else
 	{  //no exact match found, get closest point
-		const F32 epsilon = 2.f/65536;
+		const F32 epsilon = 1e-5f;
 		weight_map::iterator iter_up = mSkinWeights.lower_bound(pos);
 		weight_map::iterator iter_down = ++iter_up;
 
 		weight_map::iterator best = iter_up;
 
-		F32 min_dist = (iter->first - pos).magVecSquared();
+		F32 min_dist = (iter->first - pos).magVec();
 
 		bool done = false;
 		while (!done)
@@ -1709,7 +1722,7 @@ LLModel::weight_list& LLModel::getJointInfluences(const LLVector3& pos)
 			if (iter_up != mSkinWeights.end() && ++iter_up != mSkinWeights.end())
 			{
 				done = false;
-				F32 dist = (iter_up->first - pos).magVecSquared();
+				F32 dist = (iter_up->first - pos).magVec();
 
 				if (dist < epsilon)
 				{
@@ -1727,7 +1740,7 @@ LLModel::weight_list& LLModel::getJointInfluences(const LLVector3& pos)
 			{
 				done = false;
 
-				F32 dist = (iter_down->first - pos).magVecSquared();
+				F32 dist = (iter_down->first - pos).magVec();
 
 				if (dist < epsilon)
 				{
@@ -1890,14 +1903,71 @@ bool LLModel::loadModel(std::istream& is)
 
 }
 
-void LLModel::matchMaterialOrder(LLModel* ref)
+bool LLModel::isMaterialListSubset( LLModel* ref )
 {
-	llassert(ref->mMaterialList.size() == mMaterialList.size());
+	int refCnt = ref->mMaterialList.size();
+	int modelCnt = mMaterialList.size();
+	
+	for (U32 src = 0; src < modelCnt; ++src)
+	{				
+		bool foundRef = false;
+		
+		for (U32 dst = 0; dst < refCnt; ++dst)
+		{
+			//llinfos<<mMaterialList[src]<<" "<<ref->mMaterialList[dst]<<llendl;
+			foundRef = mMaterialList[src] == ref->mMaterialList[dst];									
+				
+			if ( foundRef )
+			{	
+				break;
+			}										
+		}
+		if (!foundRef)
+		{
+			return false;
+		}
+	}
+	
+	return true;
+}
 
+bool LLModel::needToAddFaces( LLModel* ref, int& refFaceCnt, int& modelFaceCnt )
+{
+	bool changed = false;
+	if ( refFaceCnt< modelFaceCnt )
+	{
+		refFaceCnt += modelFaceCnt - refFaceCnt;
+		changed = true;
+	}
+	else 
+	if ( modelFaceCnt < refFaceCnt )
+	{
+		modelFaceCnt += refFaceCnt - modelFaceCnt;
+		changed = true;
+	}
+	
+	return changed;
+}
+
+bool LLModel::matchMaterialOrder(LLModel* ref, int& refFaceCnt, int& modelFaceCnt )
+{
+	//Is this a subset?
+	//LODs cannot currently add new materials, e.g.
+	//1. ref = a,b,c lod1 = d,e => This is not permitted
+	//2. ref = a,b,c lod1 = c => This would be permitted
+	
+	bool isASubset = isMaterialListSubset( ref );
+	if ( !isASubset )
+	{
+		llinfos<<"Material of model is not a subset of reference."<<llendl;
+		return false;
+	}
+	
 	std::map<std::string, U32> index_map;
 	
 	//build a map of material slot names to face indexes
 	bool reorder = false;
+
 	std::set<std::string> base_mat;
 	std::set<std::string> cur_mat;
 
@@ -1939,6 +2009,7 @@ void LLModel::matchMaterialOrder(LLModel* ref)
 
 	//override material list with reference model ordering
 	mMaterialList = ref->mMaterialList;
+	return true;
 }
 
 
@@ -2329,8 +2400,6 @@ LLSD LLModel::Decomposition::asLLSD() const
 
 			for (U32 k = 0; k < 3; k++)
 			{
-				llassert(v[k] <= 0.51f && v[k] >= -0.51f);
-
 				//convert to 16-bit normalized across domain
 				U16 val = (U16) (((v[k]-min.mV[k])/range.mV[k])*65535);
 
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h
index 3f58eba07d..1cf528fd9f 100644
--- a/indra/llprimitive/llmodel.h
+++ b/indra/llprimitive/llmodel.h
@@ -148,6 +148,7 @@ public:
 	static LLModel* loadModelFromDomMesh(domMesh* mesh);
 	static std::string getElementLabel(daeElement* element);
 	std::string getName() const;
+	std::string getMetric() const {return mMetric;}
 	EModelStatus getStatus() const {return mStatus;}
 	static std::string getStatusString(U32 status) ;
 
@@ -175,8 +176,10 @@ public:
 	
 	//reorder face list based on mMaterialList in this and reference so 
 	//order matches that of reference (material ordering touchup)
-	void matchMaterialOrder(LLModel* reference);
-
+	bool matchMaterialOrder(LLModel* ref, int& refFaceCnt, int& modelFaceCnt );
+	bool isMaterialListSubset( LLModel* ref );
+	bool needToAddFaces( LLModel* ref, int& refFaceCnt, int& modelFaceCnt );
+	
 	std::vector<std::string> mMaterialList;
 
 	//data used for skin weights
@@ -217,6 +220,19 @@ public:
 		}
 	};
 
+	
+	//Are the doubles the same w/in epsilon specified tolerance
+	bool areEqual( double a, double b ) 
+	{
+		const float epsilon = 1e-5f;
+		return (fabs((a - b)) < epsilon) ? true : false ;
+	}
+	//Make sure that we return false for any values that are within the tolerance for equivalence
+	bool jointPositionalLookup( const LLVector3& a, const LLVector3& b ) 
+	{
+		 return ( areEqual( a[0],b[0]) && areEqual( a[1],b[1] ) && areEqual( a[2],b[2]) ) ? true : false;
+	}
+
 	//copy of position array for this model -- mPosition[idx].mV[X,Y,Z]
 	std::vector<LLVector3> mPosition;
 
@@ -234,6 +250,8 @@ public:
 	std::string mRequestedLabel; // name requested in UI, if any.
 	std::string mLabel; // name computed from dae.
 
+	std::string mMetric; // user-supplied metric data for upload
+
 	LLVector3 mNormalizedScale;
 	LLVector3 mNormalizedTranslation;
 
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index ebdd47ae80..06dfc90d83 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -198,6 +198,7 @@ LLLineEditor::~LLLineEditor()
 
 void LLLineEditor::onFocusReceived()
 {
+	gEditMenuHandler = this;
 	LLUICtrl::onFocusReceived();
 	updateAllowingLanguageInput();
 }
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index cb2abc5bc0..4dd11541b9 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -1266,6 +1266,7 @@ BOOL LLWindowMacOSX::setSize(const LLCoordScreen size)
 
 void LLWindowMacOSX::swapBuffers()
 {
+	glFinish();
 	aglSwapBuffers(mContext);
 }
 
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index b65287715c..e41aa9820f 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -984,7 +984,10 @@ BOOL LLWindowSDL::setSize(const LLCoordScreen size)
 void LLWindowSDL::swapBuffers()
 {
 	if (mWindow)
+	{	
+		glFinish();
 		SDL_GL_SwapBuffers();
+	}
 }
 
 U32 LLWindowSDL::getFSAASamples()
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 1239e2d40b..121c7880df 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -2896,6 +2896,7 @@ BOOL LLWindowWin32::resetDisplayResolution()
 
 void LLWindowWin32::swapBuffers()
 {
+	glFinish();
 	SwapBuffers(mhDC);
 }
 
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index ce47cca16f..9f84135754 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -77,7 +77,7 @@ include_directories(
 
 set(viewer_SOURCE_FILES
     groupchatlistener.cpp
-    llaccountingquotamanager.cpp
+    llaccountingcostmanager.cpp
     llagent.cpp
     llagentaccess.cpp
     llagentcamera.cpp
@@ -213,6 +213,7 @@ set(viewer_SOURCE_FILES
     llfloatermodelwizard.cpp
     llfloaternamedesc.cpp
     llfloaternotificationsconsole.cpp
+    llfloaterobjectweights.cpp
     llfloateropenobject.cpp
     llfloaterpay.cpp
     llfloaterperms.cpp
@@ -639,7 +640,7 @@ set(viewer_HEADER_FILES
     CMakeLists.txt
     ViewerInstall.cmake
     groupchatlistener.h
-    llaccountingquotamanager.h
+    llaccountingcostmanager.h
     llagent.h
     llagentaccess.h
     llagentcamera.h
@@ -776,6 +777,7 @@ set(viewer_HEADER_FILES
     llfloatermodelwizard.h
     llfloaternamedesc.h
     llfloaternotificationsconsole.h
+    llfloaterobjectweights.h
     llfloateropenobject.h
     llfloaterpay.h
     llfloaterperms.h
diff --git a/indra/newview/app_settings/CA.pem b/indra/newview/app_settings/CA.pem
index a16b4225e5..8c1b9a1f37 100644
--- a/indra/newview/app_settings/CA.pem
+++ b/indra/newview/app_settings/CA.pem
@@ -2792,188 +2792,6 @@ KWss5nbZqSl9Mt3JNjy9rjXxEZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv
 2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwPDPafepE39peC4N1xaf92P2BNPM/3
 mfnGV/TJVTl4uix5yaaIK/QI
 -----END CERTIFICATE-----
-cp . `md5 -q .`.pem
-cp ./.pem `md5 -q ./.pem`.pem
-cp ./cert000.pem `md5 -q ./cert000.pem`.pem
-cp ./cert001.pem `md5 -q ./cert001.pem`.pem
-cp ./cert002.pem `md5 -q ./cert002.pem`.pem
-cp ./cert003.pem `md5 -q ./cert003.pem`.pem
-cp ./cert004.pem `md5 -q ./cert004.pem`.pem
-cp ./cert005.pem `md5 -q ./cert005.pem`.pem
-cp ./cert006.pem `md5 -q ./cert006.pem`.pem
-cp ./cert007.pem `md5 -q ./cert007.pem`.pem
-cp ./cert008.pem `md5 -q ./cert008.pem`.pem
-cp ./cert009.pem `md5 -q ./cert009.pem`.pem
-cp ./cert010.pem `md5 -q ./cert010.pem`.pem
-cp ./cert011.pem `md5 -q ./cert011.pem`.pem
-cp ./cert012.pem `md5 -q ./cert012.pem`.pem
-cp ./cert013.pem `md5 -q ./cert013.pem`.pem
-cp ./cert014.pem `md5 -q ./cert014.pem`.pem
-cp ./cert015.pem `md5 -q ./cert015.pem`.pem
-cp ./cert016.pem `md5 -q ./cert016.pem`.pem
-cp ./cert017.pem `md5 -q ./cert017.pem`.pem
-cp ./cert018.pem `md5 -q ./cert018.pem`.pem
-cp ./cert019.pem `md5 -q ./cert019.pem`.pem
-cp ./cert020.pem `md5 -q ./cert020.pem`.pem
-cp ./cert021.pem `md5 -q ./cert021.pem`.pem
-cp ./cert022.pem `md5 -q ./cert022.pem`.pem
-cp ./cert023.pem `md5 -q ./cert023.pem`.pem
-cp ./cert024.pem `md5 -q ./cert024.pem`.pem
-cp ./cert025.pem `md5 -q ./cert025.pem`.pem
-cp ./cert026.pem `md5 -q ./cert026.pem`.pem
-cp ./cert027.pem `md5 -q ./cert027.pem`.pem
-cp ./cert028.pem `md5 -q ./cert028.pem`.pem
-cp ./cert029.pem `md5 -q ./cert029.pem`.pem
-cp ./cert030.pem `md5 -q ./cert030.pem`.pem
-cp ./cert031.pem `md5 -q ./cert031.pem`.pem
-cp ./cert032.pem `md5 -q ./cert032.pem`.pem
-cp ./cert033.pem `md5 -q ./cert033.pem`.pem
-cp ./cert034.pem `md5 -q ./cert034.pem`.pem
-cp ./cert035.pem `md5 -q ./cert035.pem`.pem
-cp ./cert036.pem `md5 -q ./cert036.pem`.pem
-cp ./cert037.pem `md5 -q ./cert037.pem`.pem
-cp ./cert038.pem `md5 -q ./cert038.pem`.pem
-cp ./cert039.pem `md5 -q ./cert039.pem`.pem
-cp ./cert040.pem `md5 -q ./cert040.pem`.pem
-cp ./cert041.pem `md5 -q ./cert041.pem`.pem
-cp ./cert042.pem `md5 -q ./cert042.pem`.pem
-cp ./cert043.pem `md5 -q ./cert043.pem`.pem
-cp ./cert044.pem `md5 -q ./cert044.pem`.pem
-cp ./cert045.pem `md5 -q ./cert045.pem`.pem
-cp ./cert046.pem `md5 -q ./cert046.pem`.pem
-cp ./cert047.pem `md5 -q ./cert047.pem`.pem
-cp ./cert048.pem `md5 -q ./cert048.pem`.pem
-cp ./cert049.pem `md5 -q ./cert049.pem`.pem
-cp ./cert050.pem `md5 -q ./cert050.pem`.pem
-cp ./cert051.pem `md5 -q ./cert051.pem`.pem
-cp ./cert052.pem `md5 -q ./cert052.pem`.pem
-cp ./cert053.pem `md5 -q ./cert053.pem`.pem
-cp ./cert054.pem `md5 -q ./cert054.pem`.pem
-cp ./cert055.pem `md5 -q ./cert055.pem`.pem
-cp ./cert056.pem `md5 -q ./cert056.pem`.pem
-cp ./cert057.pem `md5 -q ./cert057.pem`.pem
-cp ./cert058.pem `md5 -q ./cert058.pem`.pem
-cp ./cert059.pem `md5 -q ./cert059.pem`.pem
-cp ./cert060.pem `md5 -q ./cert060.pem`.pem
-cp ./cert061.pem `md5 -q ./cert061.pem`.pem
-cp ./cert062.pem `md5 -q ./cert062.pem`.pem
-cp ./cert063.pem `md5 -q ./cert063.pem`.pem
-cp ./cert064.pem `md5 -q ./cert064.pem`.pem
-cp ./cert065.pem `md5 -q ./cert065.pem`.pem
-cp ./cert066.pem `md5 -q ./cert066.pem`.pem
-cp ./cert067.pem `md5 -q ./cert067.pem`.pem
-cp ./cert068.pem `md5 -q ./cert068.pem`.pem
-cp ./cert069.pem `md5 -q ./cert069.pem`.pem
-cp ./cert070.pem `md5 -q ./cert070.pem`.pem
-cp ./cert071.pem `md5 -q ./cert071.pem`.pem
-cp ./cert072.pem `md5 -q ./cert072.pem`.pem
-cp ./cert073.pem `md5 -q ./cert073.pem`.pem
-cp ./cert074.pem `md5 -q ./cert074.pem`.pem
-cp ./cert075.pem `md5 -q ./cert075.pem`.pem
-cp ./cert076.pem `md5 -q ./cert076.pem`.pem
-cp ./cert077.pem `md5 -q ./cert077.pem`.pem
-cp ./cert078.pem `md5 -q ./cert078.pem`.pem
-cp ./cert079.pem `md5 -q ./cert079.pem`.pem
-cp ./cert080.pem `md5 -q ./cert080.pem`.pem
-cp ./cert081.pem `md5 -q ./cert081.pem`.pem
-cp ./cert082.pem `md5 -q ./cert082.pem`.pem
-cp ./cert083.pem `md5 -q ./cert083.pem`.pem
-cp ./cert084.pem `md5 -q ./cert084.pem`.pem
-cp ./cert085.pem `md5 -q ./cert085.pem`.pem
-cp ./cert086.pem `md5 -q ./cert086.pem`.pem
-cp ./cert087.pem `md5 -q ./cert087.pem`.pem
-cp ./cert088.pem `md5 -q ./cert088.pem`.pem
-cp ./cert089.pem `md5 -q ./cert089.pem`.pem
-cp ./cert090.pem `md5 -q ./cert090.pem`.pem
-cp ./cert091.pem `md5 -q ./cert091.pem`.pem
-cp ./cert092.pem `md5 -q ./cert092.pem`.pem
-cp ./cert093.pem `md5 -q ./cert093.pem`.pem
-cp ./cert094.pem `md5 -q ./cert094.pem`.pem
-cp ./cert095.pem `md5 -q ./cert095.pem`.pem
-cp ./cert096.pem `md5 -q ./cert096.pem`.pem
-cp ./cert097.pem `md5 -q ./cert097.pem`.pem
-cp ./cert098.pem `md5 -q ./cert098.pem`.pem
-cp ./cert099.pem `md5 -q ./cert099.pem`.pem
-cp ./cert100.pem `md5 -q ./cert100.pem`.pem
-cp ./cert101.pem `md5 -q ./cert101.pem`.pem
-cp ./cert102.pem `md5 -q ./cert102.pem`.pem
-cp ./cert103.pem `md5 -q ./cert103.pem`.pem
-cp ./cert104.pem `md5 -q ./cert104.pem`.pem
-cp ./cert105.pem `md5 -q ./cert105.pem`.pem
-cp ./cert106.pem `md5 -q ./cert106.pem`.pem
-cp ./cert107.pem `md5 -q ./cert107.pem`.pem
-cp ./cert108.pem `md5 -q ./cert108.pem`.pem
-cp ./cert109.pem `md5 -q ./cert109.pem`.pem
-cp ./cert110.pem `md5 -q ./cert110.pem`.pem
-cp ./cert111.pem `md5 -q ./cert111.pem`.pem
-cp ./cert112.pem `md5 -q ./cert112.pem`.pem
-cp ./cert113.pem `md5 -q ./cert113.pem`.pem
-cp ./cert114.pem `md5 -q ./cert114.pem`.pem
-cp ./cert115.pem `md5 -q ./cert115.pem`.pem
-cp ./cert116.pem `md5 -q ./cert116.pem`.pem
-cp ./cert117.pem `md5 -q ./cert117.pem`.pem
-cp ./cert118.pem `md5 -q ./cert118.pem`.pem
-cp ./cert119.pem `md5 -q ./cert119.pem`.pem
-cp ./cert120.pem `md5 -q ./cert120.pem`.pem
-cp ./cert121.pem `md5 -q ./cert121.pem`.pem
-cp ./cert122.pem `md5 -q ./cert122.pem`.pem
-cp ./cert123.pem `md5 -q ./cert123.pem`.pem
-cp ./cert124.pem `md5 -q ./cert124.pem`.pem
-cp ./cert125.pem `md5 -q ./cert125.pem`.pem
-cp ./cert126.pem `md5 -q ./cert126.pem`.pem
-cp ./cert127.pem `md5 -q ./cert127.pem`.pem
-cp ./cert128.pem `md5 -q ./cert128.pem`.pem
-cp ./cert129.pem `md5 -q ./cert129.pem`.pem
-cp ./cert130.pem `md5 -q ./cert130.pem`.pem
-cp ./cert131.pem `md5 -q ./cert131.pem`.pem
-cp ./cert132.pem `md5 -q ./cert132.pem`.pem
-cp ./cert133.pem `md5 -q ./cert133.pem`.pem
-cp ./cert134.pem `md5 -q ./cert134.pem`.pem
-cp ./cert135.pem `md5 -q ./cert135.pem`.pem
-cp ./cert136.pem `md5 -q ./cert136.pem`.pem
-cp ./cert137.pem `md5 -q ./cert137.pem`.pem
-cp ./cert138.pem `md5 -q ./cert138.pem`.pem
-cp ./cert139.pem `md5 -q ./cert139.pem`.pem
-cp ./cert140.pem `md5 -q ./cert140.pem`.pem
-cp ./cert141.pem `md5 -q ./cert141.pem`.pem
-cp ./cert142.pem `md5 -q ./cert142.pem`.pem
-cp ./cert143.pem `md5 -q ./cert143.pem`.pem
-cp ./cert144.pem `md5 -q ./cert144.pem`.pem
-cp ./cert145.pem `md5 -q ./cert145.pem`.pem
-cp ./cert146.pem `md5 -q ./cert146.pem`.pem
-cp ./cert147.pem `md5 -q ./cert147.pem`.pem
-cp ./cert148.pem `md5 -q ./cert148.pem`.pem
-cp ./cert149.pem `md5 -q ./cert149.pem`.pem
-cp ./cert150.pem `md5 -q ./cert150.pem`.pem
-cp ./cert151.pem `md5 -q ./cert151.pem`.pem
-cp ./cert152.pem `md5 -q ./cert152.pem`.pem
-cp ./cert153.pem `md5 -q ./cert153.pem`.pem
-cp ./cert154.pem `md5 -q ./cert154.pem`.pem
-cp ./cert155.pem `md5 -q ./cert155.pem`.pem
-cp ./cert156.pem `md5 -q ./cert156.pem`.pem
-cp ./cert157.pem `md5 -q ./cert157.pem`.pem
-cp ./cert158.pem `md5 -q ./cert158.pem`.pem
-cp ./cert159.pem `md5 -q ./cert159.pem`.pem
-cp ./cert160.pem `md5 -q ./cert160.pem`.pem
-cp ./cert161.pem `md5 -q ./cert161.pem`.pem
-cp ./cert162.pem `md5 -q ./cert162.pem`.pem
-cp ./cert163.pem `md5 -q ./cert163.pem`.pem
-cp ./cert164.pem `md5 -q ./cert164.pem`.pem
-cp ./cert165.pem `md5 -q ./cert165.pem`.pem
-cp ./cert166.pem `md5 -q ./cert166.pem`.pem
-cp ./cert167.pem `md5 -q ./cert167.pem`.pem
-cp ./cert168.pem `md5 -q ./cert168.pem`.pem
-cp ./cert169.pem `md5 -q ./cert169.pem`.pem
-cp ./cert170.pem `md5 -q ./cert170.pem`.pem
-cp ./cert171.pem `md5 -q ./cert171.pem`.pem
-cp ./cert172.pem `md5 -q ./cert172.pem`.pem
-cp ./cert173.pem `md5 -q ./cert173.pem`.pem
-cp ./cert174.pem `md5 -q ./cert174.pem`.pem
-cp ./cert175.pem `md5 -q ./cert175.pem`.pem
-cp ./cert176.pem `md5 -q ./cert176.pem`.pem
-cp ./cert177.pem `md5 -q ./cert177.pem`.pem
-cp ./cert178.pem `md5 -q ./cert178.pem`.pem
-cp ./foo.sh `md5 -q ./foo.sh`.pem
 -----BEGIN CERTIFICATE-----
 MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
 GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
@@ -3012,136 +2830,6 @@ Wy10QJLZYxkNc91pvGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeT
 mJlglFwjz1onl14LBQaTNx47aTbrqZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK
 4SVhM7JZG+Ju1zdXtg2pEto=
 -----END CERTIFICATE-----
-cp . `md5 -q .`.pem
-cp ./cert000 `md5 -q ./cert000`.pem
-cp ./cert001 `md5 -q ./cert001`.pem
-cp ./cert002 `md5 -q ./cert002`.pem
-cp ./cert003 `md5 -q ./cert003`.pem
-cp ./cert004 `md5 -q ./cert004`.pem
-cp ./cert005 `md5 -q ./cert005`.pem
-cp ./cert006 `md5 -q ./cert006`.pem
-cp ./cert007 `md5 -q ./cert007`.pem
-cp ./cert008 `md5 -q ./cert008`.pem
-cp ./cert009 `md5 -q ./cert009`.pem
-cp ./cert010 `md5 -q ./cert010`.pem
-cp ./cert011 `md5 -q ./cert011`.pem
-cp ./cert012 `md5 -q ./cert012`.pem
-cp ./cert013 `md5 -q ./cert013`.pem
-cp ./cert014 `md5 -q ./cert014`.pem
-cp ./cert015 `md5 -q ./cert015`.pem
-cp ./cert016 `md5 -q ./cert016`.pem
-cp ./cert017 `md5 -q ./cert017`.pem
-cp ./cert018 `md5 -q ./cert018`.pem
-cp ./cert019 `md5 -q ./cert019`.pem
-cp ./cert020 `md5 -q ./cert020`.pem
-cp ./cert021 `md5 -q ./cert021`.pem
-cp ./cert022 `md5 -q ./cert022`.pem
-cp ./cert023 `md5 -q ./cert023`.pem
-cp ./cert024 `md5 -q ./cert024`.pem
-cp ./cert025 `md5 -q ./cert025`.pem
-cp ./cert026 `md5 -q ./cert026`.pem
-cp ./cert027 `md5 -q ./cert027`.pem
-cp ./cert028 `md5 -q ./cert028`.pem
-cp ./cert029 `md5 -q ./cert029`.pem
-cp ./cert030 `md5 -q ./cert030`.pem
-cp ./cert031 `md5 -q ./cert031`.pem
-cp ./cert032 `md5 -q ./cert032`.pem
-cp ./cert033 `md5 -q ./cert033`.pem
-cp ./cert034 `md5 -q ./cert034`.pem
-cp ./cert035 `md5 -q ./cert035`.pem
-cp ./cert036 `md5 -q ./cert036`.pem
-cp ./cert037 `md5 -q ./cert037`.pem
-cp ./cert038 `md5 -q ./cert038`.pem
-cp ./cert039 `md5 -q ./cert039`.pem
-cp ./cert040 `md5 -q ./cert040`.pem
-cp ./cert041 `md5 -q ./cert041`.pem
-cp ./cert042 `md5 -q ./cert042`.pem
-cp ./cert043 `md5 -q ./cert043`.pem
-cp ./cert044 `md5 -q ./cert044`.pem
-cp ./cert045 `md5 -q ./cert045`.pem
-cp ./cert046 `md5 -q ./cert046`.pem
-cp ./cert047 `md5 -q ./cert047`.pem
-cp ./cert048 `md5 -q ./cert048`.pem
-cp ./cert049 `md5 -q ./cert049`.pem
-cp ./cert050 `md5 -q ./cert050`.pem
-cp ./cert051 `md5 -q ./cert051`.pem
-cp ./cert052 `md5 -q ./cert052`.pem
-cp ./cert053 `md5 -q ./cert053`.pem
-cp ./cert054 `md5 -q ./cert054`.pem
-cp ./cert055 `md5 -q ./cert055`.pem
-cp ./cert056 `md5 -q ./cert056`.pem
-cp ./cert057 `md5 -q ./cert057`.pem
-cp ./cert058 `md5 -q ./cert058`.pem
-cp ./cert059 `md5 -q ./cert059`.pem
-cp ./cert060 `md5 -q ./cert060`.pem
-cp ./cert061 `md5 -q ./cert061`.pem
-cp ./cert062 `md5 -q ./cert062`.pem
-cp ./cert063 `md5 -q ./cert063`.pem
-cp ./cert064 `md5 -q ./cert064`.pem
-cp ./cert065 `md5 -q ./cert065`.pem
-cp ./cert066 `md5 -q ./cert066`.pem
-cp ./cert067 `md5 -q ./cert067`.pem
-cp ./cert068 `md5 -q ./cert068`.pem
-cp ./cert069 `md5 -q ./cert069`.pem
-cp ./cert070 `md5 -q ./cert070`.pem
-cp ./cert071 `md5 -q ./cert071`.pem
-cp ./cert072 `md5 -q ./cert072`.pem
-cp ./cert073 `md5 -q ./cert073`.pem
-cp ./cert074 `md5 -q ./cert074`.pem
-cp ./cert075 `md5 -q ./cert075`.pem
-cp ./cert076 `md5 -q ./cert076`.pem
-cp ./cert077 `md5 -q ./cert077`.pem
-cp ./cert078 `md5 -q ./cert078`.pem
-cp ./cert079 `md5 -q ./cert079`.pem
-cp ./cert080 `md5 -q ./cert080`.pem
-cp ./cert081 `md5 -q ./cert081`.pem
-cp ./cert082 `md5 -q ./cert082`.pem
-cp ./cert083 `md5 -q ./cert083`.pem
-cp ./cert084 `md5 -q ./cert084`.pem
-cp ./cert085 `md5 -q ./cert085`.pem
-cp ./cert086 `md5 -q ./cert086`.pem
-cp ./cert087 `md5 -q ./cert087`.pem
-cp ./cert088 `md5 -q ./cert088`.pem
-cp ./cert089 `md5 -q ./cert089`.pem
-cp ./cert090 `md5 -q ./cert090`.pem
-cp ./cert091 `md5 -q ./cert091`.pem
-cp ./cert092 `md5 -q ./cert092`.pem
-cp ./cert093 `md5 -q ./cert093`.pem
-cp ./cert094 `md5 -q ./cert094`.pem
-cp ./cert095 `md5 -q ./cert095`.pem
-cp ./cert096 `md5 -q ./cert096`.pem
-cp ./cert097 `md5 -q ./cert097`.pem
-cp ./cert098 `md5 -q ./cert098`.pem
-cp ./cert099 `md5 -q ./cert099`.pem
-cp ./cert100 `md5 -q ./cert100`.pem
-cp ./cert101 `md5 -q ./cert101`.pem
-cp ./cert102 `md5 -q ./cert102`.pem
-cp ./cert103 `md5 -q ./cert103`.pem
-cp ./cert104 `md5 -q ./cert104`.pem
-cp ./cert105 `md5 -q ./cert105`.pem
-cp ./cert106 `md5 -q ./cert106`.pem
-cp ./cert107 `md5 -q ./cert107`.pem
-cp ./cert108 `md5 -q ./cert108`.pem
-cp ./cert109 `md5 -q ./cert109`.pem
-cp ./cert110 `md5 -q ./cert110`.pem
-cp ./cert111 `md5 -q ./cert111`.pem
-cp ./cert112 `md5 -q ./cert112`.pem
-cp ./cert113 `md5 -q ./cert113`.pem
-cp ./cert114 `md5 -q ./cert114`.pem
-cp ./cert115 `md5 -q ./cert115`.pem
-cp ./cert116 `md5 -q ./cert116`.pem
-cp ./cert117 `md5 -q ./cert117`.pem
-cp ./cert118 `md5 -q ./cert118`.pem
-cp ./cert119 `md5 -q ./cert119`.pem
-cp ./cert120 `md5 -q ./cert120`.pem
-cp ./cert121 `md5 -q ./cert121`.pem
-cp ./cert122 `md5 -q ./cert122`.pem
-cp ./cert123 `md5 -q ./cert123`.pem
-cp ./cert124 `md5 -q ./cert124`.pem
-cp ./cert125 `md5 -q ./cert125`.pem
-cp ./cert126 `md5 -q ./cert126`.pem
-cp ./cert127 `md5 -q ./cert127`.pem
-cp ./foo.sh `md5 -q ./foo.sh`.pem
 -----BEGIN CERTIFICATE-----
 MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzET
 MBEGA1UEBxMKQnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UE
@@ -4587,28 +4275,6 @@ zo9uoV1/A3U05K2JRVRevq4opbs/eHnrc7MKDf2+yfdWrPa37S+bISnHOLaVxATy
 wy39FCqQmbkHzJ8=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJO
-TDEeMBwGA1UEChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFh
-dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEy
-MTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4wHAYDVQQKExVTdGFhdCBkZXIgTmVk
-ZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxhbmRlbiBSb290IENB
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFtvszn
-ExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw71
-9tV2U02PjLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MO
-hXeiD+EwR+4A5zN9RGcaC1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+U
-tFE5A3+y3qcym7RHjm+0Sq7lr7HcsBthvJly3uSJt3omXdozSVtSnA71iq3DuD3o
-BmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn622r+I/q85Ej0ZytqERAh
-SQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRVHSAAMDww
-OgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMv
-cm9vdC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA
-7Jbg0zTBLL9s+DANBgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k
-/rvuFbQvBgwp8qiSpGEN/KtcCFtREytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzm
-eafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbwMVcoEoJz6TMvplW0C5GUR5z6
-u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3ynGQI0DvDKcWy
-7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR
-iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw==
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
 MIIDpDCCAoygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEc
 MBoGA1UEChMTQW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBP
 bmxpbmUgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAxMB4XDTAyMDUyODA2
@@ -5883,3 +5549,25 @@ na9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkhMp6q
 qIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0Z
 TbvGRNs2yyqcjg==
 -----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJO
+TDEeMBwGA1UEChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFh
+dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEy
+MTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4wHAYDVQQKExVTdGFhdCBkZXIgTmVk
+ZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxhbmRlbiBSb290IENB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFtvszn
+ExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw71
+9tV2U02PjLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MO
+hXeiD+EwR+4A5zN9RGcaC1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+U
+tFE5A3+y3qcym7RHjm+0Sq7lr7HcsBthvJly3uSJt3omXdozSVtSnA71iq3DuD3o
+BmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn622r+I/q85Ej0ZytqERAh
+SQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRVHSAAMDww
+OgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMv
+cm9vdC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA
+7Jbg0zTBLL9s+DANBgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k
+/rvuFbQvBgwp8qiSpGEN/KtcCFtREytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzm
+eafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbwMVcoEoJz6TMvplW0C5GUR5z6
+u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3ynGQI0DvDKcWy
+7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR
+iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw==
+-----END CERTIFICATE-----
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 07799d4eee..74c6f34570 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -25,7 +25,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <real>0</real>
+      <real>300</real>
     </map>
     <key>AdminMenu</key>
     <map>
@@ -5512,7 +5512,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>64.0</real>
+      <real>128.0</real>
     </map>
     <key>MaxWearableWaitTime</key>
     <map>
@@ -5668,6 +5668,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>MemoryPrivatePoolSize</key>
+    <map>
+      <key>Comment</key>
+      <string>Size of the private memory pool in MB (min. value is 256)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>512</integer>
+    </map>
     <key>MemProfiling</key>
     <map>
       <key>Comment</key>
@@ -7127,17 +7138,6 @@
       <key>Value</key>
       <real>0.0</real>
     </map>
-    <key>QuitAfterSecondsOfAFK</key>
-    <map>
-      <key>Comment</key>
-      <string>The duration allowed after being AFK before quitting.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>0.0</real>
-    </map>
     <key>QuitOnLoginActivated</key>
     <map>
       <key>Comment</key>
@@ -7438,6 +7438,88 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+  <key>RenderAvatarComplexityLimit</key>
+    <map>
+      <key>Comment</key>
+      <string>Max visual complexity of avatars in a scene</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>-1</integer>
+    </map>
+  <key>RenderComplexityColorMin</key>
+    <map>
+      <key>Comment</key>
+      <string>Max visual complexity of avatars in a scene</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Color4</string>
+      <key>Value</key>
+      <array>
+        <real>0.0</real>
+        <real>0.0</real>
+        <real>1.0</real>
+        <real>0.5</real>
+      </array>
+    </map>
+  <key>RenderComplexityColorMid</key>
+    <map>
+      <key>Comment</key>
+      <string>Max visual complexity of avatars in a scene</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Color4</string>
+      <key>Value</key>
+      <array>
+        <real>0.0</real>
+        <real>1.0</real>
+        <real>0.0</real>
+        <real>0.5</real>
+      </array>
+    </map>
+  <key>RenderComplexityColorMax</key>
+    <map>
+      <key>Comment</key>
+      <string>Max visual complexity of avatars in a scene</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Color4</string>
+      <key>Value</key>
+      <array>
+        <real>1.0</real>
+        <real>0.0</real>
+        <real>0.0</real>
+        <real>0.5</real>
+      </array>
+    </map>
+  <key>RenderComplexityThreshold</key>
+    <map>
+      <key>Comment</key>
+      <string>Only color objects higher than render threshold</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>-1</integer>
+    </map>
+  <key>RenderComplexityStaticMax</key>
+    <map>
+      <key>Comment</key>
+      <string>Sets a static max value for scaling of RenderComplexity 
+        display (-1 for dynamic scaling)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>-1</integer>
+    </map>
     <key>RenderAvatarLODFactor</key>
     <map>
       <key>Comment</key>
@@ -9602,17 +9684,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>ShowAdvancedBuilderOptions</key>
-    <map>
-      <key>Comment</key>
-      <string>Shows physics and display weight</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>ShowAdvancedGraphicsSettings</key>
     <map>
       <key>Comment</key>
@@ -13504,7 +13575,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>ShowOfferedInventory</key>
     <map>
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index 1f9dc6e4e5..e12c2f7853 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -88,7 +88,7 @@ RenderTerrainLODFactor		1	1
 RenderTransparentWater		1	0
 RenderTreeLODFactor			1	0
 RenderUseImpostors			1	1
-RenderVolumeLODFactor		1	0.5
+RenderVolumeLODFactor		1	1.125
 VertexShaderEnable			1	0
 WindLightUseAtmosShaders	1	0
 WLSkyDetail					1	48
diff --git a/indra/newview/llaccountingcostmanager.cpp b/indra/newview/llaccountingcostmanager.cpp
new file mode 100644
index 0000000000..8767955fcb
--- /dev/null
+++ b/indra/newview/llaccountingcostmanager.cpp
@@ -0,0 +1,181 @@
+/** 
+ * @file LLAccountingQuotaManager.cpp
+ * @ Handles the setting and accessing for costs associated with mesh 
+ *
+ * $LicenseInfo:firstyear=2001&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2011, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+#include "llaccountingcostmanager.h"
+#include "llagent.h"
+#include "llcurl.h"
+#include "llhttpclient.h"
+//===============================================================================
+LLAccountingCostManager::LLAccountingCostManager()
+{	
+}
+//===============================================================================
+class LLAccountingCostResponder : public LLCurl::Responder
+{
+public:
+	LLAccountingCostResponder( const LLSD& objectIDs, const LLHandle<LLAccountingCostObserver>& observer_handle )
+	: mObjectIDs( objectIDs ),
+	  mObserverHandle( observer_handle )
+	{
+		LLAccountingCostObserver* observer = mObserverHandle.get();
+		if (observer)
+		{
+			mTransactionID = observer->getTransactionID();
+		}
+	}
+
+	void clearPendingRequests ( void )
+	{
+		for ( LLSD::array_iterator iter = mObjectIDs.beginArray(); iter != mObjectIDs.endArray(); ++iter )
+		{
+			LLAccountingCostManager::getInstance()->removePendingObject( iter->asUUID() );
+		}
+	}
+	
+	void error( U32 statusNum, const std::string& reason )
+	{
+		llwarns	<< "Transport error "<<reason<<llendl;	
+		clearPendingRequests();
+
+		LLAccountingCostObserver* observer = mObserverHandle.get();
+		if (observer && observer->getTransactionID() == mTransactionID)
+		{
+			observer->setErrorStatus(statusNum, reason);
+		}
+	}
+	
+	void result( const LLSD& content )
+	{
+		//Check for error
+		if ( !content.isMap() || content.has("error") )
+		{
+			llwarns	<< "Error on fetched data"<< llendl;
+		}
+		else if (content.has("selected"))
+		{
+			F32 physicsCost		= 0.0f;
+			F32 networkCost		= 0.0f;
+			F32 simulationCost	= 0.0f;
+
+			physicsCost		= content["selected"]["physics"].asReal();
+			networkCost		= content["selected"]["streaming"].asReal();
+			simulationCost	= content["selected"]["simulation"].asReal();
+				
+			SelectionCost selectionCost( /*transactionID,*/ physicsCost, networkCost, simulationCost );
+
+			LLAccountingCostObserver* observer = mObserverHandle.get();
+			if (observer && observer->getTransactionID() == mTransactionID)
+			{
+				observer->onWeightsUpdate(selectionCost);
+			}
+		}
+
+		clearPendingRequests();
+	}
+	
+private:
+	//List of posted objects
+	LLSD mObjectIDs;
+
+	// Current request ID
+	LLUUID mTransactionID;
+
+	// Cost update observer handle
+	LLHandle<LLAccountingCostObserver> mObserverHandle;
+};
+//===============================================================================
+void LLAccountingCostManager::fetchCosts( eSelectionType selectionType,
+										  const std::string& url,
+										  const LLHandle<LLAccountingCostObserver>& observer_handle )
+{
+	// Invoking system must have already determined capability availability
+	if ( !url.empty() )
+	{
+		LLSD objectList;
+		U32  objectIndex = 0;
+		
+		IDIt IDIter = mObjectList.begin();
+		IDIt IDIterEnd = mObjectList.end();
+		
+		for ( ; IDIter != IDIterEnd; ++IDIter )
+		{
+			// Check to see if a request for this object has already been made.
+			if ( mPendingObjectQuota.find( *IDIter ) ==	mPendingObjectQuota.end() )
+			{
+				mPendingObjectQuota.insert( *IDIter );
+				objectList[objectIndex++] = *IDIter;
+			}
+		}
+	
+		mObjectList.clear();
+		
+		//Post results
+		if ( objectList.size() > 0 )
+		{
+			std::string keystr;
+			if ( selectionType == Roots ) 
+			{ 
+				keystr="selected_roots"; 
+			}
+			else
+			if ( selectionType == Prims ) 
+			{ 
+				keystr="selected_prims";
+			}
+			else 
+			{
+				llinfos<<"Invalid selection type "<<llendl;
+				mObjectList.clear();
+				mPendingObjectQuota.clear();
+				return;
+			}
+			
+			LLSD dataToPost = LLSD::emptyMap();		
+			dataToPost[keystr.c_str()] = objectList;
+
+			LLHTTPClient::post( url, dataToPost, new LLAccountingCostResponder( objectList, observer_handle ));
+		}
+	}
+	else
+	{
+		//url was empty - warn & continue
+		llwarns<<"Supplied url is empty "<<llendl;
+		mObjectList.clear();
+		mPendingObjectQuota.clear();
+	}
+}
+//===============================================================================
+void LLAccountingCostManager::addObject( const LLUUID& objectID )
+{
+	mObjectList.insert( objectID );
+}
+//===============================================================================
+void LLAccountingCostManager::removePendingObject( const LLUUID& objectID )
+{
+	mPendingObjectQuota.erase( objectID );
+}
+//===============================================================================
diff --git a/indra/newview/llaccountingquotamanager.h b/indra/newview/llaccountingcostmanager.h
index 9251ef9351..0bca1f54ef 100644
--- a/indra/newview/llaccountingquotamanager.h
+++ b/indra/newview/llaccountingcostmanager.h
@@ -27,29 +27,49 @@
 #ifndef LL_ACCOUNTINGQUOTAMANAGER_H
 #define LL_ACCOUNTINGQUOTAMANAGER_H
 //===============================================================================
-#include "llaccountingquota.h"
+#include "llhandle.h"
+
+#include "llaccountingcost.h"
+//===============================================================================
+// An interface class for panels which display the parcel accounting information.
+class LLAccountingCostObserver
+{
+public:
+	LLAccountingCostObserver() { mObserverHandle.bind(this); }
+	virtual ~LLAccountingCostObserver() {}
+	virtual void onWeightsUpdate(const SelectionCost& selection_cost) = 0;
+	virtual void setErrorStatus(U32 status, const std::string& reason) = 0;
+	const LLHandle<LLAccountingCostObserver>& getObserverHandle() const { return mObserverHandle; }
+	const LLUUID& getTransactionID() { return mTransactionID; }
+
+protected:
+	virtual void generateTransactionID() = 0;
+
+	LLRootHandle<LLAccountingCostObserver> mObserverHandle;
+	LLUUID		mTransactionID;
+};
 //===============================================================================
-class LLAccountingQuotaManager : public LLSingleton<LLAccountingQuotaManager>
+class LLAccountingCostManager : public LLSingleton<LLAccountingCostManager>
 {
 public:
 	//Ctor
-	LLAccountingQuotaManager();
+	LLAccountingCostManager();
 	//Store an object that will be eventually fetched
-	void updateObjectCost( const LLUUID& objectID );
+	void addObject( const LLUUID& objectID );
 	//Request quotas for object list
-	void fetchQuotas( const std::string& url );
+	void fetchCosts( eSelectionType selectionType, const std::string& url,
+			const LLHandle<LLAccountingCostObserver>& observer_handle );
 	//Delete a specific object from the pending list
-	void removePendingObjectQuota( const LLUUID& objectID );
+	void removePendingObject( const LLUUID& objectID );
 	
 private:
-	//Set of objects that need to update their cost
-	std::set<LLUUID> mUpdateObjectQuota;
-	//During fetchQuota we move object into a the pending set to signify that 
+	//Set of objects that will be used to generate a cost
+	std::set<LLUUID> mObjectList;
+	//During fetchCosts we move object into a the pending set to signify that 
 	//a fetch has been instigated.
 	std::set<LLUUID> mPendingObjectQuota;
 	typedef std::set<LLUUID>::iterator IDIt;
 };
 //===============================================================================
 
-#endif // LLACCOUNTINGQUOTAMANAGER
-
+#endif // LLACCOUNTINGCOSTMANAGER
diff --git a/indra/newview/llaccountingquotamanager.cpp b/indra/newview/llaccountingquotamanager.cpp
deleted file mode 100644
index a4f5de5632..0000000000
--- a/indra/newview/llaccountingquotamanager.cpp
+++ /dev/null
@@ -1,278 +0,0 @@
-/** 
- * @file LLAccountingQuotaManager.cpp
- * @ Handles the setting and accessing for costs associated with mesh 
- *
- * $LicenseInfo:firstyear=2001&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2011, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#include "llviewerprecompiledheaders.h"
-#include "llaccountingquotamanager.h"
-#include "llagent.h"
-#include "llviewerregion.h"
-#include "llviewerobject.h"
-#include "llviewerobjectlist.h"
-#include "llviewerparcelmgr.h"
-#include "llparcel.h"
-
-//===============================================================================
-LLAccountingQuotaManager::LLAccountingQuotaManager()
-{	
-}
-//===============================================================================
-class LLAccountingQuotaResponder : public LLCurl::Responder
-{
-public:
-	LLAccountingQuotaResponder( const LLSD& objectIDs )
-	: mObjectIDs( objectIDs )
-	{
-	}
-		
-	void clearPendingRequests ( void )
-	{
-		for ( LLSD::array_iterator iter = mObjectIDs.beginArray(); iter != mObjectIDs.endArray(); ++iter )
-		{
-			LLAccountingQuotaManager::getInstance()->removePendingObjectQuota( iter->asUUID() );
-		}
-	}
-	
-	void error( U32 statusNum, const std::string& reason )
-	{
-		llwarns	<< "Transport error "<<reason<<llendl;	
-		//prep#do we really want to remove all because of one failure - verify
-		clearPendingRequests();
-	}
-	
-	void result( const LLSD& content )
-	{
-		if ( !content.isMap() || content.has("error") )
-		{
-			llwarns	<< "Error on fetched data"<< llendl;
-			//prep#do we really want to remove all because of one failure - verify
-			clearPendingRequests();
-			return;
-		}
-		
-		//Differentiate what the incoming caps could be from the data	
-		bool containsParcel    = content.has("parcel");
-		bool containsSelection = content.has("selected");
-					
-		//Loop over the stored object ids checking against the incoming data
-		for ( LLSD::array_iterator iter = mObjectIDs.beginArray(); iter != mObjectIDs.endArray(); ++iter )
-		{
-			LLUUID objectID = iter->asUUID();
-						
-			LLAccountingQuotaManager::getInstance()->removePendingObjectQuota( objectID );
-				
-			if ( containsParcel )
-			{
-					//Typically should be one
-					S32 dataCount = content["parcel"].size();
-					for(S32 i = 0; i < dataCount; i++)
-					{
-						//prep#todo verify that this is safe, otherwise just add a bool
-						LLUUID parcelId;
-						//S32 parcelOwner = 0;
-						if ( content["parcel"][i].has("parcel_id") )
-						{
-							parcelId = content["parcel"][i]["parcel_id"].asUUID();
-						}
-						
-						//if ( content["parcel"][i].has("parcel_owner") )
-						//{
-						//	parcelOwner = content["parcel"][i]["parcel_owner"].asInteger();
-						//}
-											
-						F32 ownerRenderCost		= 0;
-						F32 ownerPhysicsCost	= 0;
-						F32 ownerNetworkCost	= 0;
-						F32 ownerSimulationCost = 0;
-						
-						F32 groupRenderCost		= 0;
-						F32 groupPhysicsCost	= 0;
-						F32 groupNetworkCost	= 0;
-						F32 groupSimulationCost = 0;
-						
-						F32 otherRenderCost		= 0;
-						F32 otherPhysicsCost	= 0;
-						F32 otherNetworkCost	= 0;
-						F32 otherSimulationCost = 0;
-						
-						F32 tempRenderCost		= 0;
-						F32 tempPhysicsCost		= 0;
-						F32 tempNetworkCost		= 0;
-						F32 tempSimulationCost  = 0;
-						
-						F32 selectedRenderCost		= 0;
-						F32 selectedPhysicsCost		= 0;
-						F32 selectedNetworkCost		= 0;
-						F32 selectedSimulationCost  = 0;
-						
-						F32 parcelCapacity			= 0;
-
-						if ( content["parcel"][i].has("capacity") )
-						{
-							parcelCapacity =  content["parcel"][i].has("capacity");
-						}
-
-						if ( content["parcel"][i].has("owner") )
-						{
-							ownerRenderCost		= content["parcel"][i]["owner"]["rendering"].asReal();
-							ownerPhysicsCost	= content["parcel"][i]["owner"]["physics"].asReal();
-							ownerNetworkCost	= content["parcel"][i]["owner"]["streaming"].asReal();
-							ownerSimulationCost = content["parcel"][i]["owner"]["simulation"].asReal();							
-						}
-
-						if ( content["parcel"][i].has("group") )
-						{
-							groupRenderCost		= content["parcel"][i]["group"]["rendering"].asReal();
-							groupPhysicsCost	= content["parcel"][i]["group"]["physics"].asReal();
-							groupNetworkCost	= content["parcel"][i]["group"]["streaming"].asReal();
-							groupSimulationCost = content["parcel"][i]["group"]["simulation"].asReal();
-							
-						}
-						if ( content["parcel"][i].has("other") )
-						{
-							otherRenderCost		= content["parcel"][i]["other"]["rendering"].asReal();
-							otherPhysicsCost	= content["parcel"][i]["other"]["physics"].asReal();
-							otherNetworkCost	= content["parcel"][i]["other"]["streaming"].asReal();
-							otherSimulationCost = content["parcel"][i]["other"]["simulation"].asReal();
-						}
-						
-						if ( content["parcel"][i].has("temp") )
-						{
-							tempRenderCost		= content["parcel"][i]["total"]["rendering"].asReal();
-							tempPhysicsCost		= content["parcel"][i]["total"]["physics"].asReal();
-							tempNetworkCost		= content["parcel"][i]["total"]["streaming"].asReal();
-							tempSimulationCost  = content["parcel"][i]["total"]["simulation"].asReal();							
-						}
-
-						if ( content["parcel"][i].has("selected") )
-						{
-							selectedRenderCost		= content["parcel"][i]["total"]["rendering"].asReal();
-							selectedPhysicsCost		= content["parcel"][i]["total"]["physics"].asReal();
-							selectedNetworkCost		= content["parcel"][i]["total"]["streaming"].asReal();
-							selectedSimulationCost  = content["parcel"][i]["total"]["simulation"].asReal();							
-						}
-						
-						ParcelQuota parcelQuota( ownerRenderCost,	 ownerPhysicsCost,	  ownerNetworkCost,    ownerSimulationCost,
-												 groupRenderCost,	 groupPhysicsCost,	  groupNetworkCost,    groupSimulationCost,
-												 otherRenderCost,	 otherPhysicsCost,	  otherNetworkCost,    otherSimulationCost,
-												 tempRenderCost,	 tempPhysicsCost,	  tempNetworkCost,	   tempSimulationCost,
-												 selectedRenderCost, selectedPhysicsCost, selectedNetworkCost, selectedSimulationCost,
-												 parcelCapacity );
-						//Update the Parcel						
-						LLParcel* pParcel = LLViewerParcelMgr::getInstance()->getParcelSelection()->getParcel();
-						if ( pParcel )
-						{
-							pParcel->updateQuota( objectID, parcelQuota ); 
-						}
-					}					
-				}
-			else 
-			if ( containsSelection )
-			{
-				S32 dataCount = content["selected"].size();
-				for(S32 i = 0; i < dataCount; i++)
-				{
-					
-					F32 renderCost		= 0;
-					F32 physicsCost		= 0;
-					F32 networkCost		= 0;
-					F32 simulationCost	= 0;
-					
-					LLUUID objectId;
-					
-					objectId		= content["selected"][i]["local_id"].asUUID();
-					renderCost		= content["selected"][i]["rendering"].asReal();
-					physicsCost		= content["selected"][i]["physics"].asReal();
-					networkCost		= content["selected"][i]["streaming"].asReal();
-					simulationCost	= content["selected"][i]["simulation"].asReal();
-					
-					SelectionQuota selectionQuota( objectId, renderCost, physicsCost, networkCost, simulationCost );
-					
-					//Update the objects					
-					gObjectList.updateQuota( objectId, selectionQuota ); 
-					
-				}
-			}
-			else
-			{
-				//Nothing in string 
-				LLAccountingQuotaManager::getInstance()->removePendingObjectQuota( objectID );
-			}
-		}
-	}
-	
-private:
-	//List of posted objects
-	LLSD mObjectIDs;
-};
-//===============================================================================
-void LLAccountingQuotaManager::fetchQuotas( const std::string& url )
-{
-	// Invoking system must have already determined capability availability
-	if ( !url.empty() )
-	{
-		LLSD objectList;
-		U32  objectIndex = 0;
-		IDIt IDIter = mUpdateObjectQuota.begin();
-		IDIt IDIterEnd = mUpdateObjectQuota.end();
-		
-		for ( ; IDIter != IDIterEnd; ++IDIter )
-		{
-			// Check to see if a request for this object has already been made.
-			if ( mPendingObjectQuota.find( *IDIter ) ==	mPendingObjectQuota.end() )
-			{
-				mPendingObjectQuota.insert( *IDIter );	
-				objectList[objectIndex++] = *IDIter;
-			}
-		}
-	
-		mUpdateObjectQuota.clear();
-		
-		//Post results
-		if ( objectList.size() > 0 )
-		{
-			LLSD dataToPost = LLSD::emptyMap();			
-			dataToPost["object_ids"] = objectList;
-			LLHTTPClient::post( url, dataToPost, new LLAccountingQuotaResponder( objectList ));
-		}
-	}
-	else
-	{
-		//url was empty - warn & continue
-		llwarns<<"Supplied url is empty "<<llendl;
-		mUpdateObjectQuota.clear();
-		mPendingObjectQuota.clear();
-	}
-}
-//===============================================================================
-void LLAccountingQuotaManager::updateObjectCost( const LLUUID& objectID )
-{
-	mUpdateObjectQuota.insert( objectID );
-}
-//===============================================================================
-void LLAccountingQuotaManager::removePendingObjectQuota( const LLUUID& objectID )
-{
-	mPendingObjectQuota.erase( objectID );
-}
-//===============================================================================
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 1587ed2dd7..ba42126985 100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -107,7 +107,6 @@ const F64 CHAT_AGE_FAST_RATE = 3.0;
 const F32 MIN_FIDGET_TIME = 8.f; // seconds
 const F32 MAX_FIDGET_TIME = 20.f; // seconds
 
-
 // The agent instance.
 LLAgent gAgent;
 
@@ -115,6 +114,9 @@ LLAgent gAgent;
 // Statics
 //
 
+/// minimum time after setting away state before coming back based on movement
+const F32 LLAgent::MIN_AFK_TIME = 10.0f;
+
 const F32 LLAgent::TYPING_TIMEOUT_SECS = 5.f;
 
 std::map<std::string, std::string> LLAgent::sTeleportErrorMessages;
@@ -1165,6 +1167,7 @@ void LLAgent::setAFK()
 	{
 		sendAnimationRequest(ANIM_AGENT_AWAY, ANIM_REQUEST_START);
 		setControlFlags(AGENT_CONTROL_AWAY | AGENT_CONTROL_STOP);
+		LL_INFOS("AFK") << "Setting Away" << LL_ENDL;
 		gAwayTimer.start();
 		if (gAFKMenu)
 		{
@@ -1188,6 +1191,7 @@ void LLAgent::clearAFK()
 	{
 		sendAnimationRequest(ANIM_AGENT_AWAY, ANIM_REQUEST_STOP);
 		clearControlFlags(AGENT_CONTROL_AWAY);
+		LL_INFOS("AFK") << "Clearing Away" << LL_ENDL;
 		if (gAFKMenu)
 		{
 			gAFKMenu->setLabel(LLTrans::getString("AvatarSetAway"));
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 67ed1923c0..5e23ced424 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -318,7 +318,8 @@ public:
 	void			setAFK();
 	void			clearAFK();
 	BOOL			getAFK() const;
-
+	static const F32 MIN_AFK_TIME;
+	
 	//--------------------------------------------------------------------
 	// Run
 	//--------------------------------------------------------------------
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 7b75bbf430..fa0b392f1b 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -246,7 +246,6 @@ extern BOOL gDebugGL;
 
 ////////////////////////////////////////////////////////////
 // All from the last globals push...
-const F32 DEFAULT_AFK_TIMEOUT = 5.f * 60.f; // time with no input before user flagged as Away From Keyboard
 
 F32 gSimLastTime; // Used in LLAppViewer::init and send_stats()
 F32 gSimFrames;
@@ -429,8 +428,11 @@ static bool app_metrics_qa_mode = false;
 void idle_afk_check()
 {
 	// check idle timers
-	if (gSavedSettings.getS32("AFKTimeout") && (gAwayTriggerTimer.getElapsedTimeF32() > gSavedSettings.getS32("AFKTimeout")))
+	F32 current_idle = gAwayTriggerTimer.getElapsedTimeF32();
+	F32 afk_timeout  = gSavedSettings.getS32("AFKTimeout");
+	if (afk_timeout && (current_idle > afk_timeout) && ! gAgent.getAFK())
 	{
+		LL_INFOS("IdleAway") << "Idle more than " << afk_timeout << " seconds: automatically changing to Away status" << LL_ENDL;
 		gAgent.setAFK();
 	}
 }
@@ -721,7 +723,7 @@ bool LLAppViewer::init()
 	//set the max heap size.
 	initMaxHeapSize() ;
 
-	LLPrivateMemoryPoolManager::initClass((BOOL)gSavedSettings.getBOOL("MemoryPrivatePoolEnabled")) ;
+	LLPrivateMemoryPoolManager::initClass((BOOL)gSavedSettings.getBOOL("MemoryPrivatePoolEnabled"), (U32)gSavedSettings.getU32("MemoryPrivatePoolSize")) ;
 
 	// write Google Breakpad minidump files to our log directory
 	std::string logdir = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "");
@@ -1121,9 +1123,12 @@ void LLAppViewer::checkMemory()
 {
 	const static F32 MEMORY_CHECK_INTERVAL = 1.0f ; //second
 	//const static F32 MAX_QUIT_WAIT_TIME = 30.0f ; //seconds
-	const static U32 MAX_SIZE_CHECKED_MEMORY_BLOCK = 64 * 1024 * 1024 ; //64 MB
 	//static F32 force_quit_timer = MAX_QUIT_WAIT_TIME + MEMORY_CHECK_INTERVAL ;
-	static void* last_reserved_address = NULL ;
+
+	if(!gGLManager.mDebugGPU)
+	{
+		return ;
+	}
 
 	if(MEMORY_CHECK_INTERVAL > mMemCheckTimer.getElapsedTimeF32())
 	{
@@ -1131,53 +1136,12 @@ void LLAppViewer::checkMemory()
 	}
 	mMemCheckTimer.reset() ;
 
-	if(gGLManager.mDebugGPU)
-	{
 		//update the availability of memory
 		LLMemory::updateMemoryInfo() ;
-	}
 
-	//check the virtual address space fragmentation
-	if(!last_reserved_address)
-	{
-		last_reserved_address = LLMemory::tryToAlloc(last_reserved_address, MAX_SIZE_CHECKED_MEMORY_BLOCK) ;
-	}
-	else
-	{
-		last_reserved_address = LLMemory::tryToAlloc(last_reserved_address, MAX_SIZE_CHECKED_MEMORY_BLOCK) ;
-		if(!last_reserved_address) //failed, try once more
-		{
-			last_reserved_address = LLMemory::tryToAlloc(last_reserved_address, MAX_SIZE_CHECKED_MEMORY_BLOCK) ;
-		}
-	}
-
-	S32 is_low = !last_reserved_address || LLMemory::isMemoryPoolLow() ;
+	bool is_low = LLMemory::isMemoryPoolLow() ;
 
-	//if(is_low < 0) //to force quit
-	//{
-	//	if(force_quit_timer > MAX_QUIT_WAIT_TIME) //just hit the limit for the first time
-	//	{
-	//		//send out the notification to tell the viewer is about to quit in 30 seconds.
-	//		LLNotification::Params params("ForceQuitDueToLowMemory");
-	//		LLNotifications::instance().add(params);
-
-	//		force_quit_timer = MAX_QUIT_WAIT_TIME - MEMORY_CHECK_INTERVAL ;
-	//	}
-	//	else
-	//	{
-	//		force_quit_timer -= MEMORY_CHECK_INTERVAL ;
-	//		if(force_quit_timer < 0.f)
-	//		{
-	//			forceQuit() ; //quit
-	//		}
-	//	}
-	//}
-	//else
-	//{
-	//	force_quit_timer = MAX_QUIT_WAIT_TIME + MEMORY_CHECK_INTERVAL ;
-	//}
-
-	LLPipeline::throttleNewMemoryAllocation(!is_low ? FALSE : TRUE) ;		
+	LLPipeline::throttleNewMemoryAllocation(is_low) ;		
 	
 	if(is_low)
 	{
@@ -2323,6 +2287,7 @@ bool LLAppViewer::initConfiguration()
 
 	if (gSavedSettings.getBOOL("FirstRunThisInstall"))
 	{
+		// Note that the "FirstRunThisInstall" settings is currently unused.
 		gSavedSettings.setBOOL("FirstRunThisInstall", FALSE);
 	}
 
@@ -4168,18 +4133,6 @@ void LLAppViewer::idle()
 		}
 	}
 
-	// debug setting to quit after N seconds of being AFK - 0 to never do this
-	F32 qas_afk = gSavedSettings.getF32("QuitAfterSecondsOfAFK");
-	if (qas_afk > 0.f)
-	{
-		// idle time is more than setting
-		if ( gAwayTriggerTimer.getElapsedTimeF32() > qas_afk )
-		{
-			// go ahead and just quit gracefully
-			LLAppViewer::instance()->requestQuit();
-		}
-	}
-
 	// Must wait until both have avatar object and mute list, so poll
 	// here.
 	request_initial_instant_messages();
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 7a444edd43..42de47e777 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -254,7 +254,7 @@ public:
 		mSourceType = chat.mSourceType;
 
 		//*TODO overly defensive thing, source type should be maintained out there
-		if((chat.mFromID.isNull() && chat.mFromName.empty()) || chat.mFromName == SYSTEM_FROM && chat.mFromID.isNull())
+		if((chat.mFromID.isNull() && chat.mFromName.empty()) || (chat.mFromName == SYSTEM_FROM && chat.mFromID.isNull()))
 		{
 			mSourceType = CHAT_SOURCE_SYSTEM;
 		}  
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index 28e464b60d..37ee81aeb5 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -1299,30 +1299,38 @@ void LLDrawPoolAvatar::updateRiggedFaceVertexBuffer(LLVOAvatar* avatar, LLFace*
 		return;
 	}
 
-	LLVertexBuffer* buffer = face->getVertexBuffer();
+	LLPointer<LLVertexBuffer> buffer = face->getVertexBuffer();
+	LLDrawable* drawable = face->getDrawable();
 
 	U32 data_mask = face->getRiggedVertexBufferDataMask();
 	
-	if (!buffer || 
+	if (buffer.isNull() || 
 		buffer->getTypeMask() != data_mask ||
-		buffer->getRequestedVerts() != vol_face.mNumVertices)
+		buffer->getRequestedVerts() != vol_face.mNumVertices ||
+		buffer->getRequestedIndices() != vol_face.mNumIndices ||
+		(drawable && drawable->isState(LLDrawable::REBUILD_ALL)))
 	{
 		face->setGeomIndex(0);
 		face->setIndicesIndex(0);
-		face->setSize(vol_face.mNumVertices, vol_face.mNumIndices, true);
-
-
-		if (sShaderLevel > 0)
-		{
-			buffer = new LLVertexBuffer(data_mask, GL_DYNAMIC_DRAW_ARB);
+		
+		if (buffer.isNull() || buffer->getTypeMask() != data_mask)
+		{ //make a new buffer
+			if (sShaderLevel > 0)
+			{
+				buffer = new LLVertexBuffer(data_mask, GL_DYNAMIC_DRAW_ARB);
+			}
+			else
+			{
+				buffer = new LLVertexBuffer(data_mask, GL_STREAM_DRAW_ARB);
+			}
+			buffer->allocateBuffer(vol_face.mNumVertices, vol_face.mNumIndices, true);
 		}
 		else
-		{
-			buffer = new LLVertexBuffer(data_mask, GL_STREAM_DRAW_ARB);
+		{ //resize existing buffer
+			buffer->resizeBuffer(vol_face.mNumVertices, vol_face.mNumIndices);
 		}
 
-		buffer->allocateBuffer(face->getGeomCount(), face->getIndicesCount(), true);
-
+		face->setSize(vol_face.mNumVertices, vol_face.mNumIndices);
 		face->setVertexBuffer(buffer);
 
 		U16 offset = 0;
@@ -1423,6 +1431,11 @@ void LLDrawPoolAvatar::updateRiggedFaceVertexBuffer(LLVOAvatar* avatar, LLFace*
 			}
 		}
 	}
+
+	if (drawable && (face->getTEOffset() == drawable->getNumFaces()-1))
+	{
+		drawable->clearState(LLDrawable::REBUILD_ALL);
+	}
 }
 
 void LLDrawPoolAvatar::renderRigged(LLVOAvatar* avatar, U32 type, bool glow)
@@ -1453,7 +1466,7 @@ void LLDrawPoolAvatar::renderRigged(LLVOAvatar* avatar, U32 type, bool glow)
 		LLVolume* volume = vobj->getVolume();
 		S32 te = face->getTEOffset();
 
-		if (!volume || volume->getNumVolumeFaces() <= te)
+		if (!volume || volume->getNumVolumeFaces() <= te || !volume->isMeshAssetLoaded())
 		{
 			continue;
 		}
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp
index 849826bb6b..22f500ba15 100644
--- a/indra/newview/llfloaterabout.cpp
+++ b/indra/newview/llfloaterabout.cpp
@@ -70,6 +70,22 @@ extern U32 gPacketsIn;
 
 static std::string get_viewer_release_notes_url();
 
+///----------------------------------------------------------------------------
+/// Class LLServerReleaseNotesURLFetcher
+///----------------------------------------------------------------------------
+class LLServerReleaseNotesURLFetcher : public LLHTTPClient::Responder
+{
+	LOG_CLASS(LLServerReleaseNotesURLFetcher);
+public:
+
+	static void startFetch();
+	/*virtual*/ void completedHeader(U32 status, const std::string& reason, const LLSD& content);
+	/*virtual*/ void completedRaw(
+		U32 status,
+		const std::string& reason,
+		const LLChannelDescriptors& channels,
+		const LLIOPipe::buffer_ptr_t& buffer);
+};
 
 ///----------------------------------------------------------------------------
 /// Class LLFloaterAbout
@@ -89,6 +105,11 @@ public:
 	/// separated so that we can programmatically access the same info.
 	static LLSD getInfo();
 	void onClickCopyToClipboard();
+
+	void updateServerReleaseNotesURL(const std::string& url);
+
+private:
+	void setSupportText(const std::string& server_release_notes_url);
 };
 
 
@@ -122,76 +143,17 @@ BOOL LLFloaterAbout::postBuild()
 	getChild<LLUICtrl>("copy_btn")->setCommitCallback(
 		boost::bind(&LLFloaterAbout::onClickCopyToClipboard, this));
 
-#if LL_WINDOWS
-	getWindow()->incBusyCount();
-	getWindow()->setCursor(UI_CURSOR_ARROW);
-#endif
-	LLSD info(getInfo());
-#if LL_WINDOWS
-	getWindow()->decBusyCount();
-	getWindow()->setCursor(UI_CURSOR_ARROW);
-#endif
-
-	std::ostringstream support;
-
-	// Render the LLSD from getInfo() as a format_map_t
-	LLStringUtil::format_map_t args;
-
-	// allow the "Release Notes" URL label to be localized
-	args["ReleaseNotes"] = LLTrans::getString("ReleaseNotes");
-
-	for (LLSD::map_const_iterator ii(info.beginMap()), iend(info.endMap());
-		 ii != iend; ++ii)
-	{
-		if (! ii->second.isArray())
-		{
-			// Scalar value
-			if (ii->second.isUndefined())
-			{
-				args[ii->first] = getString("none");
-			}
-			else
-			{
-				// don't forget to render value asString()
-				args[ii->first] = ii->second.asString();
-			}
-		}
-		else
-		{
-			// array value: build KEY_0, KEY_1 etc. entries
-			for (LLSD::Integer n(0), size(ii->second.size()); n < size; ++n)
-			{
-				args[STRINGIZE(ii->first << '_' << n)] = ii->second[n].asString();
-			}
-		}
-	}
-
-	// Now build the various pieces
-	support << getString("AboutHeader", args);
-	if (info.has("REGION"))
-	{
-		support << "\n\n" << getString("AboutPosition", args);
-	}
-	support << "\n\n" << getString("AboutSystem", args);
-	support << "\n";
-	if (info.has("GRAPHICS_DRIVER_VERSION"))
-	{
-		support << "\n" << getString("AboutDriver", args);
-	}
-	support << "\n" << getString("AboutLibs", args);
-	if (info.has("COMPILER"))
+	if (gAgent.getRegion())
 	{
-		support << "\n" << getString("AboutCompiler", args);
+		// start fetching server release notes URL
+		setSupportText(LLTrans::getString("RetrievingData"));
+		LLServerReleaseNotesURLFetcher::startFetch();
 	}
-	if (info.has("PACKETS_IN"))
+	else // not logged in
 	{
-		support << '\n' << getString("AboutTraffic", args);
+		setSupportText(LLStringUtil::null);
 	}
 
-	support_widget->appendText(support.str(), 
-								FALSE, 
-								LLStyle::Params()
-									.color(LLUIColorTable::instance().getColor("TextFgReadOnlyColor")));
 	support_widget->blockUndo();
 
 	// Fix views
@@ -294,7 +256,6 @@ LLSD LLFloaterAbout::getInfo()
 		info["HOSTNAME"] = gAgent.getRegion()->getHost().getHostName();
 		info["HOSTIP"] = gAgent.getRegion()->getHost().getString();
 		info["SERVER_VERSION"] = gLastVersionChannel;
-		info["SERVER_RELEASE_NOTES_URL"] = LLWeb::escapeURL(region->getCapability("ServerReleaseNotes"));
 	}
 
 	// CPU
@@ -389,6 +350,95 @@ void LLFloaterAbout::onClickCopyToClipboard()
 	support_widget->deselect();
 }
 
+void LLFloaterAbout::updateServerReleaseNotesURL(const std::string& url)
+{
+	setSupportText(url);
+}
+
+void LLFloaterAbout::setSupportText(const std::string& server_release_notes_url)
+{
+#if LL_WINDOWS
+	getWindow()->incBusyCount();
+	getWindow()->setCursor(UI_CURSOR_ARROW);
+#endif
+	LLSD info(getInfo());
+#if LL_WINDOWS
+	getWindow()->decBusyCount();
+	getWindow()->setCursor(UI_CURSOR_ARROW);
+#endif
+
+	if (LLStringUtil::startsWith(server_release_notes_url, "http")) // it's an URL
+	{
+		info["SERVER_RELEASE_NOTES_URL"] = "[" + LLWeb::escapeURL(server_release_notes_url) + " " + LLTrans::getString("ReleaseNotes") + "]";
+	}
+	else
+	{
+		info["SERVER_RELEASE_NOTES_URL"] = server_release_notes_url;
+	}
+
+	LLViewerTextEditor *support_widget =
+		getChild<LLViewerTextEditor>("support_editor", true);
+
+	std::ostringstream support;
+
+	// Render the LLSD from getInfo() as a format_map_t
+	LLStringUtil::format_map_t args;
+
+	for (LLSD::map_const_iterator ii(info.beginMap()), iend(info.endMap());
+		 ii != iend; ++ii)
+	{
+		if (! ii->second.isArray())
+		{
+			// Scalar value
+			if (ii->second.isUndefined())
+			{
+				args[ii->first] = getString("none");
+			}
+			else
+			{
+				// don't forget to render value asString()
+				args[ii->first] = ii->second.asString();
+			}
+		}
+		else
+		{
+			// array value: build KEY_0, KEY_1 etc. entries
+			for (LLSD::Integer n(0), size(ii->second.size()); n < size; ++n)
+			{
+				args[STRINGIZE(ii->first << '_' << n)] = ii->second[n].asString();
+			}
+		}
+	}
+
+	// Now build the various pieces
+	support << getString("AboutHeader", args);
+	if (info.has("REGION"))
+	{
+		support << "\n\n" << getString("AboutPosition", args);
+	}
+	support << "\n\n" << getString("AboutSystem", args);
+	support << "\n";
+	if (info.has("GRAPHICS_DRIVER_VERSION"))
+	{
+		support << "\n" << getString("AboutDriver", args);
+	}
+	support << "\n" << getString("AboutLibs", args);
+	if (info.has("COMPILER"))
+	{
+		support << "\n" << getString("AboutCompiler", args);
+	}
+	if (info.has("PACKETS_IN"))
+	{
+		support << '\n' << getString("AboutTraffic", args);
+	}
+
+	support_widget->clear();
+	support_widget->appendText(support.str(),
+								FALSE,
+								LLStyle::Params()
+									.color(LLUIColorTable::instance().getColor("TextFgReadOnlyColor")));
+}
+
 ///----------------------------------------------------------------------------
 /// LLFloaterAboutUtil
 ///----------------------------------------------------------------------------
@@ -398,3 +448,52 @@ void LLFloaterAboutUtil::registerFloater()
 		&LLFloaterReg::build<LLFloaterAbout>);
 
 }
+
+///----------------------------------------------------------------------------
+/// Class LLServerReleaseNotesURLFetcher implementation
+///----------------------------------------------------------------------------
+// static
+void LLServerReleaseNotesURLFetcher::startFetch()
+{
+	LLViewerRegion* region = gAgent.getRegion();
+	if (!region) return;
+
+	// We cannot display the URL returned by the ServerReleaseNotes capability
+	// because opening it in an external browser will trigger a warning about untrusted
+	// SSL certificate.
+	// So we query the URL ourselves, expecting to find
+	// an URL suitable for external browsers in the "Location:" HTTP header.
+	std::string cap_url = region->getCapability("ServerReleaseNotes");
+	LLHTTPClient::get(cap_url, new LLServerReleaseNotesURLFetcher);
+}
+
+// virtual
+void LLServerReleaseNotesURLFetcher::completedHeader(U32 status, const std::string& reason, const LLSD& content)
+{
+	lldebugs << "Status: " << status << llendl;
+	lldebugs << "Reason: " << reason << llendl;
+	lldebugs << "Headers: " << content << llendl;
+
+	LLFloaterAbout* floater_about = LLFloaterReg::getTypedInstance<LLFloaterAbout>("sl_about");
+	if (floater_about)
+	{
+		std::string location = content["location"].asString();
+		if (location.empty())
+		{
+			location = floater_about->getString("ErrorFetchingServerReleaseNotesURL");
+		}
+		floater_about->updateServerReleaseNotesURL(location);
+	}
+}
+
+// virtual
+void LLServerReleaseNotesURLFetcher::completedRaw(
+	U32 status,
+	const std::string& reason,
+	const LLChannelDescriptors& channels,
+	const LLIOPipe::buffer_ptr_t& buffer)
+{
+	// Do nothing.
+	// We're overriding just because the base implementation tries to
+	// deserialize LLSD which triggers warnings.
+}
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 2510f43aa7..5869cf6fee 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -96,6 +96,7 @@
 #include "llsliderctrl.h"
 #include "llspinctrl.h"
 #include "lltoggleablemenu.h"
+#include "lltrans.h"
 #include "llvfile.h"
 #include "llvfs.h"
 #include "llcallbacklist.h"
@@ -106,7 +107,7 @@
 #include <boost/algorithm/string.hpp>
 
 
-const S32 SLM_SUPPORTED_VERSION = 2;
+const S32 SLM_SUPPORTED_VERSION = 3;
 
 //static
 S32 LLFloaterModelPreview::sUploadAmount = 10;
@@ -119,6 +120,19 @@ const S32 PREVIEW_HPAD = PREVIEW_RESIZE_HANDLE_SIZE;
 const S32 PREF_BUTTON_HEIGHT = 16 + 7 + 16;
 const S32 PREVIEW_TEXTURE_HEIGHT = 300;
 
+// "Retain%" decomp parameter has values from 0.0 to 1.0 by 0.01
+// But according to the UI spec for upload model floater, this parameter
+// should be represented by Retain spinner with values from 1 to 100 by 1.
+// To achieve this, RETAIN_COEFFICIENT is used while creating spinner
+// and when value is requested from spinner.
+const double RETAIN_COEFFICIENT = 100;
+
+// "Cosine%" decomp parameter has values from 0.9 to 1 by 0.001
+// But according to the UI spec for upload model floater, this parameter
+// should be represented by Smooth combobox with only 10 values.
+// So this const is used as a size of Smooth combobox list.
+const S32 SMOOTH_VALUES_NUMBER = 10;
+
 void drawBoxOutline(const LLVector3& pos, const LLVector3& size);
 
 
@@ -184,6 +198,13 @@ std::string lod_label_name[NUM_LOD+1] =
 	"I went off the end of the lod_label_name array.  Me so smart."
 };
 
+std::string colladaVersion[VERSIONTYPE_COUNT+1] = 
+{
+	"1.4.0",
+	"1.4.1",
+	"Unsupported"
+};
+
 
 #define LL_DEGENERACY_TOLERANCE  1e-7f
 
@@ -387,21 +408,23 @@ BOOL LLFloaterModelPreview::postBuild()
 		return FALSE;
 	}
 
-	childSetAction("lod_browse", onBrowseLOD, this);
-
 	childSetCommitCallback("cancel_btn", onCancel, this);
 	childSetCommitCallback("crease_angle", onGenerateNormalsCommit, this);
-	childSetCommitCallback("generate_normals", onGenerateNormalsCommit, this);
+	getChild<LLCheckBoxCtrl>("gen_normals")->setCommitCallback(boost::bind(&LLFloaterModelPreview::toggleGenarateNormals, this));
 
 	childSetCommitCallback("lod_generate", onAutoFillCommit, this);
 
-	childSetCommitCallback("lod_mode", onLODParamCommit, this);
-	childSetCommitCallback("lod_error_threshold", onLODParamCommit, this);
-	childSetCommitCallback("lod_triangle_limit", onLODParamCommitTriangleLimit, this);
-	childSetCommitCallback("build_operator", onLODParamCommit, this);
-	childSetCommitCallback("queue_mode", onLODParamCommit, this);
-	childSetCommitCallback("border_mode", onLODParamCommit, this);
-	childSetCommitCallback("share_tolerance", onLODParamCommit, this);
+	for (S32 lod = 0; lod <= LLModel::LOD_HIGH; ++lod)
+	{
+		LLComboBox* lod_source_combo = getChild<LLComboBox>("lod_source_" + lod_name[lod]);
+		lod_source_combo->setCommitCallback(boost::bind(&LLFloaterModelPreview::onLoDSourceCommit, this, lod));
+		lod_source_combo->setCurrentByIndex(mLODMode[lod]);
+
+		getChild<LLButton>("lod_browse_" + lod_name[lod])->setCommitCallback(boost::bind(&LLFloaterModelPreview::onBrowseLOD, this, lod));
+		getChild<LLComboBox>("lod_mode_" + lod_name[lod])->setCommitCallback(boost::bind(&LLFloaterModelPreview::onLODParamCommit, this, lod, false));
+		getChild<LLSpinCtrl>("lod_error_threshold_" + lod_name[lod])->setCommitCallback(boost::bind(&LLFloaterModelPreview::onLODParamCommit, this, lod, false));
+		getChild<LLSpinCtrl>("lod_triangle_limit_" + lod_name[lod])->setCommitCallback(boost::bind(&LLFloaterModelPreview::onLODParamCommit, this, lod, true));
+	}
 
 	childSetCommitCallback("upload_skin", boost::bind(&LLFloaterModelPreview::toggleCalculateButton, this), NULL);
 	childSetCommitCallback("upload_joints", boost::bind(&LLFloaterModelPreview::toggleCalculateButton, this), NULL);
@@ -422,26 +445,14 @@ BOOL LLFloaterModelPreview::postBuild()
 	childSetCommitCallback("import_scale", onImportScaleCommit, this);
 	childSetCommitCallback("pelvis_offset", onPelvisOffsetCommit, this);
 
-	childSetCommitCallback("lod_file_or_limit", refresh, this);
-	childSetCommitCallback("physics_load_radio", onPhysicsLoadRadioCommit, this);
-	//childSetCommitCallback("physics_optimize", refresh, this);
-	//childSetCommitCallback("physics_use_hull", refresh, this);
+	getChild<LLCheckBoxCtrl>("show_edges")->setCommitCallback(boost::bind(&LLFloaterModelPreview::onViewOptionChecked, this, _1));
+	getChild<LLCheckBoxCtrl>("show_physics")->setCommitCallback(boost::bind(&LLFloaterModelPreview::onViewOptionChecked, this, _1));
+	getChild<LLCheckBoxCtrl>("show_textures")->setCommitCallback(boost::bind(&LLFloaterModelPreview::onViewOptionChecked, this, _1));
+	getChild<LLCheckBoxCtrl>("show_skin_weight")->setCommitCallback(boost::bind(&LLFloaterModelPreview::onViewOptionChecked, this, _1));
+	getChild<LLCheckBoxCtrl>("show_joint_positions")->setCommitCallback(boost::bind(&LLFloaterModelPreview::onViewOptionChecked, this, _1));
 
 	childDisable("upload_skin");
 	childDisable("upload_joints");
-	
-	childDisable("ok_btn");
-
-	mViewOptionMenuButton = getChild<LLMenuButton>("options_gear_btn");
-
-	mCommitCallbackRegistrar.add("ModelImport.ViewOption.Action", boost::bind(&LLFloaterModelPreview::onViewOptionChecked, this, _2));
-	mEnableCallbackRegistrar.add("ModelImport.ViewOption.Check", boost::bind(&LLFloaterModelPreview::isViewOptionChecked, this, _2));
-	mEnableCallbackRegistrar.add("ModelImport.ViewOption.Enabled", boost::bind(&LLFloaterModelPreview::isViewOptionEnabled, this, _2));
-
-
-
-	mViewOptionMenu = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>("menu_model_import_gear_default.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
-	mViewOptionMenuButton->setMenu(mViewOptionMenu, LLMenuButton::MP_BOTTOM_LEFT);
 
 	initDecompControls();
 
@@ -535,11 +546,11 @@ void LLFloaterModelPreview::initModelPreview()
 	mModelPreview->setModelUpdatedCallback(boost::bind(&LLFloaterModelPreview::toggleCalculateButton, this, _1));
 }
 
-void LLFloaterModelPreview::onViewOptionChecked(const LLSD& userdata)
+void LLFloaterModelPreview::onViewOptionChecked(LLUICtrl* ctrl)
 {
 	if (mModelPreview)
 	{
-		mModelPreview->mViewOption[userdata.asString()] = !mModelPreview->mViewOption[userdata.asString()];
+		mModelPreview->mViewOption[ctrl->getName()] = !mModelPreview->mViewOption[ctrl->getName()];
 		
 		mModelPreview->refresh();
 	}
@@ -557,12 +568,12 @@ bool LLFloaterModelPreview::isViewOptionChecked(const LLSD& userdata)
 
 bool LLFloaterModelPreview::isViewOptionEnabled(const LLSD& userdata)
 {
-	return !mViewOptionDisabled[userdata.asString()];
+	return childIsEnabled(userdata.asString());
 }
 
 void LLFloaterModelPreview::setViewOptionEnabled(const std::string& option, bool enabled)
 {
-	mViewOptionDisabled[option] = !enabled;
+	childSetEnabled(option, enabled);
 }
 
 void LLFloaterModelPreview::enableViewOption(const std::string& option)
@@ -640,29 +651,6 @@ void LLFloaterModelPreview::onPelvisOffsetCommit( LLUICtrl*, void* userdata )
 }
 
 //static
-void LLFloaterModelPreview::onPhysicsLoadRadioCommit( LLUICtrl*, void *userdata)
-{
-	LLFloaterModelPreview* fmp = LLFloaterModelPreview::sInstance;
-	if (fmp)
-	{
-		if (fmp->childGetValue("physics_use_lod").asBoolean())
-		{
-			onPhysicsUseLOD(NULL,NULL);
-		}
-		if (fmp->childGetValue("physics_load_from_file").asBoolean())
-		{
-			
-		}
-		LLModelPreview *model_preview = fmp->mModelPreview;
-		if (model_preview)
-		{
-			model_preview->refresh();
-			model_preview->updateStatusMessages();
-		}
-	}
-}
-
-//static
 void LLFloaterModelPreview::onUploadJointsCommit(LLUICtrl*,void* userdata)
 {
 	LLFloaterModelPreview *fp =(LLFloaterModelPreview *)userdata;
@@ -716,6 +704,12 @@ void LLFloaterModelPreview::onGenerateNormalsCommit(LLUICtrl* ctrl, void* userda
 	fp->mModelPreview->generateNormals();
 }
 
+void LLFloaterModelPreview::toggleGenarateNormals()
+{
+	bool enabled = childGetValue("gen_normals").asBoolean();
+	childSetEnabled("crease_angle", enabled);
+}
+
 //static
 void LLFloaterModelPreview::onExplodeCommit(LLUICtrl* ctrl, void* userdata)
 {
@@ -732,19 +726,9 @@ void LLFloaterModelPreview::onAutoFillCommit(LLUICtrl* ctrl, void* userdata)
 	fp->mModelPreview->genLODs();
 }
 
-//static
-void LLFloaterModelPreview::onLODParamCommit(LLUICtrl* ctrl, void* userdata)
-{
-	LLFloaterModelPreview* fp = (LLFloaterModelPreview*) userdata;
-
-	fp->mModelPreview->onLODParamCommit(false);
-}
-
-//static
-void LLFloaterModelPreview::onLODParamCommitTriangleLimit(LLUICtrl* ctrl, void* userdata)
+void LLFloaterModelPreview::onLODParamCommit(S32 lod, bool enforce_tri_limit)
 {
-	LLFloaterModelPreview* fp = (LLFloaterModelPreview*) userdata;
-	fp->mModelPreview->onLODParamCommit(true);
+	mModelPreview->onLODParamCommit(lod, enforce_tri_limit);
 }
 
 
@@ -768,6 +752,7 @@ void LLFloaterModelPreview::draw()
 		if ( mModelPreview->getLoadState() == LLModelLoader::ERROR_PARSING )
 		{
 			childSetTextArg("status", "[STATUS]", getString("status_parse_error"));
+			toggleCalculateButton(false);
 		}
 		else
 		{
@@ -775,8 +760,6 @@ void LLFloaterModelPreview::draw()
 		}
 	}
 
-	childSetEnabled("ok_btn", mHasUploadPerm && !mUploadModelUrl.empty());
-
 	childSetTextArg("prim_cost", "[PRIM_COST]", llformat("%d", mModelPreview->mResourceCost));
 	childSetTextArg("description_label", "[TEXTURES]", llformat("%d", mModelPreview->mTextureSet.size()));
 
@@ -931,20 +914,32 @@ void LLFloaterModelPreview::onPhysicsParamCommit(LLUICtrl* ctrl, void* data)
 	{
 		LLCDParam* param = (LLCDParam*) data;
 		std::string name(param->mName);
-		sInstance->mDecompParams[name] = ctrl->getValue();
+
+		LLSD value = ctrl->getValue();
+
+		if("Retain%" == name)
+		{
+			value = ctrl->getValue().asReal() / RETAIN_COEFFICIENT;
+		}
+
+		sInstance->mDecompParams[name] = value;
 
 		if (name == "Simplify Method")
 		{
-			 if (ctrl->getValue().asInteger() == 0)
-			 {
-				sInstance->childSetVisible("Retain%", true);
-				sInstance->childSetVisible("Detail Scale", false);
-			 }
-			else
+			bool show_retain = false;
+			bool show_detail = true;
+
+			if (ctrl->getValue().asInteger() == 0)
 			{
-				sInstance->childSetVisible("Retain%", false);
-				sInstance->childSetVisible("Detail Scale", true);
+				 show_retain = true;
+				 show_detail = false;
 			}
+
+			sInstance->childSetVisible("Retain%", show_retain);
+			sInstance->childSetVisible("Retain%_label", show_retain);
+
+			sInstance->childSetVisible("Detail Scale", show_detail);
+			sInstance->childSetVisible("Detail Scale label", show_detail);
 		}
 	}
 }
@@ -1000,14 +995,38 @@ void LLFloaterModelPreview::onPhysicsBrowse(LLUICtrl* ctrl, void* userdata)
 //static
 void LLFloaterModelPreview::onPhysicsUseLOD(LLUICtrl* ctrl, void* userdata)
 {
+	S32 num_modes = 4;
 	S32 which_mode = 3;
+	static S32 previous_mode = which_mode;
+
 	LLCtrlSelectionInterface* iface = sInstance->childGetSelectionInterface("physics_lod_combo");
 	if (iface)
 	{
 		which_mode = iface->getFirstSelectedIndex();
 	}
 
-	sInstance->mModelPreview->setPhysicsFromLOD(which_mode);
+	S32 file_mode = iface->getItemCount() - 1;
+	bool file_browse = which_mode == file_mode;
+	bool lod_to_file = file_browse && (previous_mode != file_mode);
+	bool file_to_lod = !file_browse && (previous_mode == file_mode);
+
+	if (!lod_to_file)
+	{
+		which_mode = num_modes - which_mode;
+		sInstance->mModelPreview->setPhysicsFromLOD(which_mode);
+	}
+
+	if (lod_to_file || file_to_lod)
+	{
+		LLModelPreview *model_preview = sInstance->mModelPreview;
+		if (model_preview)
+		{
+			model_preview->refresh();
+			model_preview->updateStatusMessages();
+		}
+	}
+
+	previous_mode = which_mode;
 }
 
 //static 
@@ -1032,6 +1051,11 @@ void LLFloaterModelPreview::onPhysicsStageCancel(LLUICtrl* ctrl, void*data)
 		}
 
 		sInstance->mCurRequest.clear();
+
+		if (sInstance->mModelPreview)
+		{
+			sInstance->mModelPreview->updateStatusMessages();
+		}
 	}
 }
 
@@ -1094,8 +1118,9 @@ void LLFloaterModelPreview::initDecompControls()
 				mDecompParams[param[i].mName] = LLSD(param[i].mDefault.mFloat);
 				//llinfos << "Type: float, Default: " << param[i].mDefault.mFloat << llendl;
 
-				LLSliderCtrl* slider = getChild<LLSliderCtrl>(name);
-				if (slider)
+
+				LLUICtrl* ctrl = getChild<LLUICtrl>(name);
+				if (LLSliderCtrl* slider = dynamic_cast<LLSliderCtrl*>(ctrl))
 				{
 					slider->setMinValue(param[i].mDetails.mRange.mLow.mFloat);
 					slider->setMaxValue(param[i].mDetails.mRange.mHigh.mFloat);
@@ -1103,14 +1128,49 @@ void LLFloaterModelPreview::initDecompControls()
 					slider->setValue(param[i].mDefault.mFloat);
 					slider->setCommitCallback(onPhysicsParamCommit, (void*) &param[i]);
 				}
+				else if (LLSpinCtrl* spinner = dynamic_cast<LLSpinCtrl*>(ctrl))
+				{
+					bool is_retain_ctrl = "Retain%" == name;
+					double coefficient = is_retain_ctrl ? RETAIN_COEFFICIENT : 1.f;
+
+					spinner->setMinValue(param[i].mDetails.mRange.mLow.mFloat * coefficient);
+					spinner->setMaxValue(param[i].mDetails.mRange.mHigh.mFloat * coefficient);
+					spinner->setIncrement(param[i].mDetails.mRange.mDelta.mFloat * coefficient);
+					spinner->setValue(param[i].mDefault.mFloat * coefficient);
+					spinner->setCommitCallback(onPhysicsParamCommit, (void*) &param[i]);
+				}
+				else if (LLComboBox* combo_box = dynamic_cast<LLComboBox*>(ctrl))
+				{
+					float min = param[i].mDetails.mRange.mLow.mFloat;
+					float max = param[i].mDetails.mRange.mHigh.mFloat;
+					float delta = param[i].mDetails.mRange.mDelta.mFloat;
+
+					if ("Cosine%" == name)
+					{
+						createSmoothComboBox(combo_box, min, max);
+					}
+					else
+					{
+						for(float value = min; value <= max; value += delta)
+						{
+							std::string label = llformat("%.1f", value);
+							combo_box->add(label, value, ADD_BOTTOM, true);
+						}
+						combo_box->setValue(param[i].mDefault.mFloat);
+
+					}
+
+					combo_box->setCommitCallback(onPhysicsParamCommit, (void*) &param[i]);
+				}
 			}
 			else if (param[i].mType == LLCDParam::LLCD_INTEGER)
 			{
 				mDecompParams[param[i].mName] = LLSD(param[i].mDefault.mIntOrEnumValue);
 				//llinfos << "Type: integer, Default: " << param[i].mDefault.mIntOrEnumValue << llendl;
 
-				LLSliderCtrl* slider = getChild<LLSliderCtrl>(name);
-				if (slider)
+
+				LLUICtrl* ctrl = getChild<LLUICtrl>(name);
+				if (LLSliderCtrl* slider = dynamic_cast<LLSliderCtrl*>(ctrl))
 				{
 					slider->setMinValue(param[i].mDetails.mRange.mLow.mIntOrEnumValue);
 					slider->setMaxValue(param[i].mDetails.mRange.mHigh.mIntOrEnumValue);
@@ -1118,6 +1178,16 @@ void LLFloaterModelPreview::initDecompControls()
 					slider->setValue(param[i].mDefault.mIntOrEnumValue);
 					slider->setCommitCallback(onPhysicsParamCommit, (void*) &param[i]);
 				}
+				else if (LLComboBox* combo_box = dynamic_cast<LLComboBox*>(ctrl))
+				{
+					for(int k = param[i].mDetails.mRange.mLow.mIntOrEnumValue; k<=param[i].mDetails.mRange.mHigh.mIntOrEnumValue; k+=param[i].mDetails.mRange.mDelta.mIntOrEnumValue)
+					{
+						std::string name = llformat("%.1d", k);
+						combo_box->add(name, k, ADD_BOTTOM, true);
+					}
+					combo_box->setValue(param[i].mDefault.mIntOrEnumValue);
+					combo_box->setCommitCallback(onPhysicsParamCommit, (void*) &param[i]);
+				}
 			}
 			else if (param[i].mType == LLCDParam::LLCD_BOOLEAN)
 			{
@@ -1145,7 +1215,11 @@ void LLFloaterModelPreview::initDecompControls()
 						//llinfos << param[i].mDetails.mEnumValues.mEnumsArray[k].mValue
 						//	<< " - " << param[i].mDetails.mEnumValues.mEnumsArray[k].mName << llendl;
 
-						combo_box->add(param[i].mDetails.mEnumValues.mEnumsArray[k].mName,
+						std::string name(param[i].mDetails.mEnumValues.mEnumsArray[k].mName);
+						std::string localized_name;
+						bool is_localized = LLTrans::findString(localized_name, name);
+
+						combo_box->add(is_localized ? localized_name : name,
 							LLSD::Integer(param[i].mDetails.mEnumValues.mEnumsArray[k].mValue));
 					}
 					combo_box->setValue(param[i].mDefault.mIntOrEnumValue);
@@ -1161,6 +1235,22 @@ void LLFloaterModelPreview::initDecompControls()
 	childSetCommitCallback("physics_explode", LLFloaterModelPreview::onExplodeCommit, this);
 }
 
+void LLFloaterModelPreview::createSmoothComboBox(LLComboBox* combo_box, float min, float max)
+{
+	float delta = (max - min) / SMOOTH_VALUES_NUMBER;
+	int ilabel = 0;
+
+	combo_box->add("0 (none)", ADD_BOTTOM, true);
+
+	for(float value = min + delta; value < max; value += delta)
+	{
+		std::string label = (++ilabel == SMOOTH_VALUES_NUMBER) ? "10 (max)" : llformat("%.1d", ilabel);
+		combo_box->add(label, value, ADD_BOTTOM, true);
+	}
+
+
+}
+
 //-----------------------------------------------------------------------------
 // onMouseCaptureLost()
 //-----------------------------------------------------------------------------
@@ -1385,9 +1475,26 @@ bool LLModelLoader::doLoadModel()
 	
 	if (!dom)
 	{
+		llinfos<<" Error with dae - traditionally indicates a corrupt file."<<llendl;
+		setLoadState( ERROR_PARSING );
 		return false;
 	}
-
+	//Dom version
+	daeString domVersion = dae.getDomVersion();
+	std::string sldom(domVersion);
+	llinfos<<"Collada Importer Version: "<<sldom<<llendl;
+	//Dae version
+	domVersionType docVersion = dom->getVersion();
+	//0=1.4
+	//1=1.4.1
+	//2=Currently unsupported, however may work
+	if (docVersion > 1 ) 
+	{ 
+		docVersion = VERSIONTYPE_COUNT;
+	}
+	llinfos<<"Dae version "<<colladaVersion[docVersion]<<llendl;
+	
+	
 	daeDatabase* db = dae.getDatabase();
 	
 	daeInt count = db->getElementCount(NULL, COLLADA_TYPE_MESH);
@@ -1536,8 +1643,7 @@ bool LLModelLoader::doLoadModel()
 							
 							LLMatrix4 trans = normalized_transformation;
 							trans *= skin_info.mBindShapeMatrix;
-							skin_info.mBindShapeMatrix = trans;
-							
+							skin_info.mBindShapeMatrix = trans;							
 						}
 										
 											
@@ -1610,7 +1716,7 @@ bool LLModelLoader::doLoadModel()
 								{
 									//Build a joint for the resolver to work with
 									char str[64]={0};
-									sprintf(str,"./%s",(*jointIt).second.c_str() );
+									sprintf(str,"./%s",(*jointIt).first.c_str() );
 									//llwarns<<"Joint "<< str <<llendl;
 									
 									//Setup the resolver
@@ -1621,15 +1727,22 @@ bool LLModelLoader::doLoadModel()
                                     if ( pJoint )
                                     {
 										//Pull out the translate id and store it in the jointTranslations map
-										daeSIDResolver jointResolver( pJoint, "./translate" );
-										domTranslate* pTranslate = daeSafeCast<domTranslate>( jointResolver.getElement() );
+										daeSIDResolver jointResolverA( pJoint, "./translate" );
+										domTranslate* pTranslateA = daeSafeCast<domTranslate>( jointResolverA.getElement() );
+										daeSIDResolver jointResolverB( pJoint, "./location" );
+										domTranslate* pTranslateB = daeSafeCast<domTranslate>( jointResolverB.getElement() );
 										
 										LLMatrix4 workingTransform;
 										
 										//Translation via SID
-										if ( pTranslate )
+										if ( pTranslateA )
+										{
+											extractTranslation( pTranslateA, workingTransform );
+										}
+										else
+										if ( pTranslateB )
 										{
-											extractTranslation( pTranslate, workingTransform );
+											extractTranslation( pTranslateB, workingTransform );
 										}
 										else
 										{
@@ -1641,9 +1754,15 @@ bool LLModelLoader::doLoadModel()
 												missingSkeletonOrScene = true;
 											}
 											else
+											if ( pTranslateElement )
 											{
 												extractTranslationViaElement( pTranslateElement, workingTransform );
 											}
+											else
+											{
+												extractTranslationViaSID( pJoint, workingTransform );
+											}
+
 										}
 										
 										//Store the joint transform w/respect to it's name.
@@ -1740,7 +1859,7 @@ bool LLModelLoader::doLoadModel()
 												}
 											}
 											
-											model->mSkinInfo.mInvBindMatrix.push_back(mat);
+											model->mSkinInfo.mInvBindMatrix.push_back(mat);											
 										}
 									}
 								}
@@ -1748,7 +1867,7 @@ bool LLModelLoader::doLoadModel()
 						}
 						
 						//Now that we've parsed the joint array, let's determine if we have a full rig
-						//(which means we have all the joints that are required for an avatar versus
+						//(which means we have all the joint sthat are required for an avatar versus
 						//a skinned asset attached to a node in a file that contains an entire skeleton,
 						//but does not use the skeleton).						
 						buildJointToNodeMappingFromScene( root );
@@ -2040,6 +2159,14 @@ bool LLModelLoader::loadFromSLM(const std::string& filename)
 		return false;
 	}
 
+	// Set name.
+	std::string name = data["name"];
+	if (!name.empty())
+	{
+		model[LLModel::LOD_HIGH][0]->mLabel = name;
+	}
+	
+
 	//load instance list
 	model_instance_list instance_list;
 
@@ -2152,15 +2279,37 @@ void LLModelLoader::processJointToNodeMapping( domNode* pNode )
 			mJointsFromNode.push_front( pNode->getName() );
 		}
 		//2. Handle the kiddo's
-		daeTArray< daeSmartRef<daeElement> > childOfChild = pNode->getChildren();
-		S32 childOfChildCount = childOfChild.getCount();
-		for (S32 i = 0; i < childOfChildCount; ++i)
+		processChildJoints( pNode );
+	}
+	else
+	{
+		//Determine if the're any children wrt to this failed node.
+		//This occurs when an armature is exported and ends up being what essentially amounts to
+		//as the root for the visual_scene
+		if ( pNode ) 
 		{
-			domNode* pChildNode = daeSafeCast<domNode>( childOfChild[i] );
-			if ( pChildNode )
-			{
-				processJointToNodeMapping( pChildNode );
-			}
+			processChildJoints( pNode );
+		}
+		else 
+		{
+			llinfos<<"Node is NULL"<<llendl;
+		}
+
+	}
+}
+//-----------------------------------------------------------------------------
+// processChildJoint()
+//-----------------------------------------------------------------------------
+void LLModelLoader::processChildJoints( domNode* pParentNode )
+{	
+	daeTArray< daeSmartRef<daeElement> > childOfChild = pParentNode->getChildren();
+	S32 childOfChildCount = childOfChild.getCount();
+	for (S32 i = 0; i < childOfChildCount; ++i)
+	{
+		domNode* pChildNode = daeSafeCast<domNode>( childOfChild[i] );
+		if ( pChildNode )
+		{
+			processJointToNodeMapping( pChildNode );
 		}
 	}
 }
@@ -2185,15 +2334,11 @@ void LLModelPreview::critiqueRigForUploadApplicability( const std::vector<std::s
 		setRigValidForJointPositionUpload( true );
 	}
 
-	if ( isRigLegacyOK )
-	{
+	if ( isRigLegacyOK) 
+	{	
 		setLegacyRigValid( true );
 	}
 
-	if ( getRigWithSceneParity() && isJointPositionUploadOK )
-	{
-		setResetJointFlag( true );
-	}
 }
 //-----------------------------------------------------------------------------
 // critiqueJointToNodeMappingFromScene()
@@ -2233,12 +2378,7 @@ void LLModelPreview::critiqueJointToNodeMappingFromScene( void  )
 	//2. Partial rig but w/o parity between the scene and joint array
 	if ( result )
 	{		
-		setResetJointFlag( true );
 		setRigWithSceneParity( true );
-	}
-	else
-	{
-		setResetJointFlag( false );
 	}	
 }
 //-----------------------------------------------------------------------------
@@ -2355,8 +2495,20 @@ void LLModelLoader::loadTextures()
 //-----------------------------------------------------------------------------
 bool LLModelLoader::isNodeAJoint( domNode* pNode )
 {
-	if ( !pNode || pNode->getName() == NULL)
+	if ( !pNode )
+	{
+		llinfos<<"Created node is NULL"<<llendl;
+		return false;
+	}
+	
+	if ( pNode->getName() == NULL )
 	{
+		llinfos<<"Parsed node has no name "<<llendl;
+		//Attempt to write the node id, if possible (aids in debugging the visual scene)
+		if ( pNode->getId() )
+		{
+			llinfos<<"Parsed node ID: "<<pNode->getId()<<llendl;
+		}
 		return false;
 	}
 
@@ -2466,10 +2618,43 @@ void LLModelLoader::extractTranslation( domTranslate* pTranslate, LLMatrix4& tra
 //-----------------------------------------------------------------------------
 void LLModelLoader::extractTranslationViaElement( daeElement* pTranslateElement, LLMatrix4& transform )
 {
-	domTranslate* pTranslateChild = dynamic_cast<domTranslate*>( pTranslateElement );
-	domFloat3 translateChild = pTranslateChild->getValue();
-	LLVector3 singleJointTranslation( translateChild[0], translateChild[1], translateChild[2] );
-	transform.setTranslation( singleJointTranslation );
+	if ( pTranslateElement )
+	{
+		domTranslate* pTranslateChild = dynamic_cast<domTranslate*>( pTranslateElement );
+		domFloat3 translateChild = pTranslateChild->getValue();
+		LLVector3 singleJointTranslation( translateChild[0], translateChild[1], translateChild[2] );
+		transform.setTranslation( singleJointTranslation );
+	}	
+}
+//-----------------------------------------------------------------------------
+// extractTranslationViaSID()
+//-----------------------------------------------------------------------------
+void LLModelLoader::extractTranslationViaSID( daeElement* pElement, LLMatrix4& transform )
+{
+	if ( pElement )
+	{	
+		daeSIDResolver resolver( pElement, "./transform" );
+		domMatrix* pMatrix = daeSafeCast<domMatrix>( resolver.getElement() );
+		//We are only extracting out the translational component atm
+		LLMatrix4 workingTransform;
+		if ( pMatrix )
+		{
+			domFloat4x4 domArray = pMatrix->getValue();									
+			for ( int i = 0; i < 4; i++ )
+			{
+				for( int j = 0; j < 4; j++ )
+				{
+					workingTransform.mMatrix[i][j] = domArray[i + j*4];
+				}
+			}
+			LLVector3 trans = workingTransform.getTranslation();
+			transform.setTranslation( trans );	
+		}
+	}
+	else
+	{
+		llwarns<<"Element is nonexistent - empty/unsupported node."<<llendl;
+	}
 }
 //-----------------------------------------------------------------------------
 // processJointNode()
@@ -2489,13 +2674,20 @@ void LLModelLoader::processJointNode( domNode* pNode, JointTransformMap& jointTr
 	LLMatrix4 workingTransform;
 
 	//Pull out the translate id and store it in the jointTranslations map
-	daeSIDResolver jointResolver( pNode, "./translate" );
-	domTranslate* pTranslate = daeSafeCast<domTranslate>( jointResolver.getElement() );
+	daeSIDResolver jointResolverA( pNode, "./translate" );
+	domTranslate* pTranslateA = daeSafeCast<domTranslate>( jointResolverA.getElement() );
+	daeSIDResolver jointResolverB( pNode, "./location" );
+	domTranslate* pTranslateB = daeSafeCast<domTranslate>( jointResolverB.getElement() );
 
 	//Translation via SID was successful
-	if ( pTranslate )
+	if ( pTranslateA )
+	{
+		extractTranslation( pTranslateA, workingTransform );
+	}
+	else
+	if ( pTranslateB )
 	{
-		extractTranslation( pTranslate, workingTransform );
+		extractTranslation( pTranslateB, workingTransform );
 	}
 	else
 	{
@@ -2637,6 +2829,12 @@ void LLModelLoader::processElement( daeElement* element, bool& badElement )
 				{
 					LLMatrix4 transformation = mTransform;
 
+					if (mTransform.determinant() < 0)
+					{ //negative scales are not supported
+						llinfos << "Negative scale detected, unsupported transform.  domInstance_geometry: " << LLModel::getElementLabel(instance_geo) << llendl;
+						badElement = true;
+					}
+					
 					std::map<std::string, LLImportMaterial> materials = getMaterials(model, instance_geo);
 
 					// adjust the transformation to compensate for mesh normalization
@@ -2681,7 +2879,8 @@ void LLModelLoader::processElement( daeElement* element, bool& badElement )
 
 	//process children
 	daeTArray< daeSmartRef<daeElement> > children = element->getChildren();
-	for (S32 i = 0; i < children.getCount(); i++)
+	int childCount = children.getCount();
+	for (S32 i = 0; i < childCount; i++)
 	{
 		processElement(children[i],badElement);
 	}
@@ -2981,14 +3180,6 @@ U32 LLModelPreview::calcResourceCost()
 
 	rebuildUploadData();
 
-	if (mFMP && mModelLoader)
-	{
-		if ( getLoadState() < LLModelLoader::ERROR_PARSING)
-		{
-			mFMP->childEnable("ok_btn");
-		}
-	}
-
 	//Upload skin is selected BUT check to see if the joints coming in from the asset were malformed.
 	if ( mFMP && mFMP->childGetValue("upload_skin").asBoolean() )
 	{
@@ -2996,13 +3187,7 @@ U32 LLModelPreview::calcResourceCost()
 		if ( uploadingJointPositions && !isRigValidForJointPositionUpload() )
 		{
 			mFMP->childDisable("ok_btn");		
-		}
-		else
-		if ( !isLegacyRigValid() )
-		{
-			mFMP->childDisable("ok_btn");
-		}
-		//ok_btn should not have been changed unless something was wrong with joint list
+		}		
 	}
 	
 	std::set<LLModel*> accounted;
@@ -3089,6 +3274,7 @@ U32 LLModelPreview::calcResourceCost()
 
 void LLFloaterModelPreview::setDetails(F32 x, F32 y, F32 z, F32 streaming_cost, F32 physics_cost)
 {
+	assert_main_thread();
 	childSetTextArg("import_dimensions", "[X]", llformat("%.3f", x));
 	childSetTextArg("import_dimensions", "[Y]", llformat("%.3f", y));
 	childSetTextArg("import_dimensions", "[Z]", llformat("%.3f", z));
@@ -3106,14 +3292,10 @@ void LLModelPreview::rebuildUploadData()
 
 	std::string requested_name = mFMP->getChild<LLUICtrl>("description_form")->getValue().asString();
 
+	std::string metric = mFMP->getChild<LLUICtrl>("model_category_combo")->getValue().asString();
 
 	LLSpinCtrl* scale_spinner = mFMP->getChild<LLSpinCtrl>("import_scale");
 
-	if (!scale_spinner)
-	{
-		llerrs << "floater_model_preview.xml MUST contain import_scale spinner." << llendl;
-	}
-
 	F32 scale = scale_spinner->getValue().asReal();
 
 	LLMatrix4 scale_mat;
@@ -3121,11 +3303,6 @@ void LLModelPreview::rebuildUploadData()
 
 	F32 max_scale = 0.f;
 
-	if ( mBaseScene.size() > 0)
-	{
-		mFMP->childEnable("ok_btn");
-	}
-
 	//reorder materials to match mBaseModel
 	for (U32 i = 0; i < LLModel::NUM_LODS; i++)
 	{
@@ -3133,8 +3310,14 @@ void LLModelPreview::rebuildUploadData()
 		{
 			for (U32 j = 0; j < mBaseModel.size(); ++j)
 			{
-				mModel[i][j]->matchMaterialOrder(mBaseModel[j]);
-				llassert(mModel[i][j]->mMaterialList == mBaseModel[j]->mMaterialList);
+				
+				int refFaceCnt = 0;
+				int modelFaceCnt = 0;
+				
+				if ( !mModel[i][j]->matchMaterialOrder(mBaseModel[j], refFaceCnt, modelFaceCnt ) )
+				{
+					mFMP->childDisable( "calculate_btn" );
+				}
 			}
 		}
 	}
@@ -3167,6 +3350,7 @@ void LLModelPreview::rebuildUploadData()
 			if (base_model)
 			{
 				base_model->mRequestedLabel = requested_name;
+				base_model->mMetric = metric;
 			}
 
 			S32 idx = 0;
@@ -3197,7 +3381,14 @@ void LLModelPreview::rebuildUploadData()
 		}
 	}
 
-	F32 max_import_scale = DEFAULT_MAX_PRIM_SCALE/max_scale;
+	F32 max_import_scale = (DEFAULT_MAX_PRIM_SCALE-0.1f)/max_scale;
+
+	F32 max_axis = llmax(mPreviewScale.mV[0], mPreviewScale.mV[1]);
+	max_axis = llmax(max_axis, mPreviewScale.mV[2]);
+	max_axis *= 2.f;
+
+	//clamp scale so that total imported model bounding box is smaller than 240m on a side
+	max_import_scale = llmin(max_import_scale, 240.f/max_axis);
 
 	scale_spinner->setMaxValue(max_import_scale);
 
@@ -3238,6 +3429,10 @@ void LLModelPreview::saveUploadData(const std::string& filename, bool save_skinw
 	LLSD data;
 
 	data["version"] = SLM_SUPPORTED_VERSION;
+	if (!mBaseModel.empty())
+	{
+		data["name"] = mBaseModel[0]->getName();
+	}
 
 	S32 mesh_id = 0;
 
@@ -3298,6 +3493,13 @@ void LLModelPreview::loadModel(std::string filename, S32 lod, bool force_disable
 
 	LLMutexLock lock(this);
 
+	if (lod < LLModel::LOD_IMPOSTOR || lod > LLModel::NUM_LODS - 1)
+	{
+		llwarns << "Invalid level of detail: " << lod << llendl;
+		assert(lod >= LLModel::LOD_IMPOSTOR && lod < LLModel::NUM_LODS);
+		return;
+	}
+
 	// This triggers if you bring up the file picker and then hit CANCEL.
 	// Just use the previous model (if any) and ignore that you brought up
 	// the file picker.
@@ -3343,11 +3545,12 @@ void LLModelPreview::loadModel(std::string filename, S32 lod, bool force_disable
 	if ( getLoadState() >= LLModelLoader::ERROR_PARSING )
 	{
 		mFMP->childDisable("ok_btn");
+		mFMP->childDisable( "calculate_btn" );
 	}
 	
 	if (lod == mPreviewLOD)
 	{
-		mFMP->childSetText("lod_file", mLODFile[mPreviewLOD]);
+		mFMP->childSetText("lod_file_" + lod_name[lod], mLODFile[lod]);
 	}
 	else if (lod == LLModel::LOD_PHYSICS)
 	{
@@ -3376,6 +3579,12 @@ void LLModelPreview::setPhysicsFromLOD(S32 lod)
 
 void LLModelPreview::clearIncompatible(S32 lod)
 {
+	//Don't discard models if specified model is the physic rep
+	if ( lod == LLModel::LOD_PHYSICS )
+	{
+		return;
+	}
+
 	for (U32 i = 0; i <= LLModel::LOD_HIGH; i++)
 	{ //clear out any entries that aren't compatible with this model
 		if (i != lod)
@@ -3616,6 +3825,14 @@ void LLModelPreview::generateNormals()
 
 void LLModelPreview::genLODs(S32 which_lod, U32 decimation, bool enforce_tri_limit)
 {
+	// Allow LoD from -1 to LLModel::LOD_PHYSICS
+	if (which_lod < -1 || which_lod > LLModel::NUM_LODS - 1)
+	{
+		llwarns << "Invalid level of detail: " << which_lod << llendl;
+		assert(which_lod >= -1 && which_lod < LLModel::NUM_LODS);
+		return;
+	}
+
 	if (mBaseModel.empty())
 	{
 		return;
@@ -3645,111 +3862,41 @@ void LLModelPreview::genLODs(S32 which_lod, U32 decimation, bool enforce_tri_lim
 
 	U32 lod_mode = 0;
 
-	LLCtrlSelectionInterface* iface = mFMP->childGetSelectionInterface("lod_mode");
-	if (iface)
-	{
-		lod_mode = iface->getFirstSelectedIndex();
-	}
-	mRequestedLoDMode[mPreviewLOD] = lod_mode;
-
-	F32 lod_error_threshold = mFMP->childGetValue("lod_error_threshold").asReal();
+	F32 lod_error_threshold = 0;
 
-	if (lod_mode == 0)
+	// The LoD should be in range from Lowest to High
+	if (which_lod > -1 && which_lod < NUM_LOD)
 	{
-		lod_mode = GLOD_TRIANGLE_BUDGET;
-		if (which_lod != -1)
+		LLCtrlSelectionInterface* iface = mFMP->childGetSelectionInterface("lod_mode_" + lod_name[which_lod]);
+		if (iface)
 		{
-			limit = mFMP->childGetValue("lod_triangle_limit").asInteger();
+			lod_mode = iface->getFirstSelectedIndex();
 		}
-	}
-	else
-	{
-		lod_mode = GLOD_ERROR_THRESHOLD;
-	}
 
-	U32 build_operator = 0;
-
-	iface = mFMP->childGetSelectionInterface("build_operator");
-	if (iface)
-	{
-		build_operator = iface->getFirstSelectedIndex();
-	}
-	mRequestedBuildOperator[mPreviewLOD] = build_operator; 
-
-	if (build_operator == 0)
-	{
-		build_operator = GLOD_OPERATOR_EDGE_COLLAPSE;
-	}
-	else
-	{
-		build_operator = GLOD_OPERATOR_HALF_EDGE_COLLAPSE;
-	}
-
-	U32 queue_mode=0;
-	iface = mFMP->childGetSelectionInterface("queue_mode");
-	if (iface)
-	{
-		queue_mode = iface->getFirstSelectedIndex();
+		lod_error_threshold = mFMP->childGetValue("lod_error_threshold_" + lod_name[which_lod]).asReal();
 	}
-	mRequestedQueueMode[mPreviewLOD] = queue_mode;
 
-	if (queue_mode == 0)
-	{
-		queue_mode = GLOD_QUEUE_GREEDY;
-	}
-	else if (queue_mode == 1)
-	{
-		queue_mode = GLOD_QUEUE_LAZY;
-	}
-	else
+	if (which_lod != -1)
 	{
-		queue_mode = GLOD_QUEUE_INDEPENDENT;
+		mRequestedLoDMode[which_lod] = lod_mode;
 	}
 
-	U32 border_mode = 0;
-
-	iface = mFMP->childGetSelectionInterface("border_mode");
-	if (iface)
+	if (lod_mode == 0)
 	{
-		border_mode = iface->getFirstSelectedIndex();
-	}
-	mRequestedBorderMode[mPreviewLOD] = border_mode;
+		lod_mode = GLOD_TRIANGLE_BUDGET;
 
-	if (border_mode == 0)
-	{
-		border_mode = GLOD_BORDER_UNLOCK;
+		// The LoD should be in range from Lowest to High
+		if (which_lod > -1 && which_lod < NUM_LOD)
+		{
+			limit = mFMP->childGetValue("lod_triangle_limit_" + lod_name[which_lod]).asInteger();
+		}
 	}
 	else
 	{
-		border_mode = GLOD_BORDER_LOCK;
+		lod_mode = GLOD_ERROR_THRESHOLD;
 	}
 
 	bool object_dirty = false;
-	if (border_mode != mBuildBorderMode)
-	{
-		mBuildBorderMode = border_mode;
-		object_dirty = true;
-	}
-
-	if (queue_mode != mBuildQueueMode)
-	{
-		mBuildQueueMode = queue_mode;
-		object_dirty = true;
-	}
-
-	if (build_operator != mBuildOperator)
-	{
-		mBuildOperator = build_operator;
-		object_dirty = true;
-	}
-
-	F32 share_tolerance = mFMP->childGetValue("share_tolerance").asReal();
-	if (share_tolerance != mBuildShareTolerance)
-	{
-		mBuildShareTolerance = share_tolerance;
-		object_dirty = true;
-	}
-	mRequestedShareTolerance[mPreviewLOD] = share_tolerance;
 
 	if (mGroup == 0)
 	{
@@ -3799,18 +3946,6 @@ void LLModelPreview::genLODs(S32 which_lod, U32 decimation, bool enforce_tri_lim
 				stop_gloderror();
 			}
 
-			glodObjectParameteri(mObject[mdl], GLOD_BUILD_OPERATOR, build_operator);
-			stop_gloderror();
-
-			glodObjectParameteri(mObject[mdl], GLOD_BUILD_QUEUE_MODE, queue_mode);
-			stop_gloderror();
-
-			glodObjectParameteri(mObject[mdl], GLOD_BUILD_BORDER_MODE, border_mode);
-			stop_gloderror();
-
-			glodObjectParameterf(mObject[mdl], GLOD_BUILD_SHARE_TOLERANCE, share_tolerance);
-			stop_gloderror();
-
 			glodBuildObject(mObject[mdl]);
 			stop_gloderror();
 		}
@@ -4185,6 +4320,8 @@ void LLModelPreview::updateStatusMessages()
 			icon = mFMP->getChild<LLIconCtrl>("lod_status_message_icon");
 			icon->setImage(img);
 		}
+
+		updateLodControls(lod);
 	}
 
 
@@ -4213,11 +4350,11 @@ void LLModelPreview::updateStatusMessages()
 		if ( uploadingJointPositions && !isRigValidForJointPositionUpload() )
 		{
 			skinAndRigOk = false;
-		}
+		}	
 		else
 		if ( !isLegacyRigValid() )
 		{
-			skinAndRigOk = false;
+			mFMP->childDisable("calculate_btn");
 		}
 	}
 	
@@ -4229,11 +4366,7 @@ void LLModelPreview::updateStatusMessages()
 		}
 	}
 
-	if ( upload_ok && !errorStateFromLoader && skinAndRigOk && !has_degenerate)
-	{
-		mFMP->childEnable("ok_btn");
-	}
-	else
+	if (!upload_ok || errorStateFromLoader || !skinAndRigOk || has_degenerate)
 	{
 		mFMP->childDisable("ok_btn");
 	}
@@ -4300,12 +4433,14 @@ void LLModelPreview::updateStatusMessages()
 			{
 				fmp->enableViewOption("show_physics");
 				mViewOption["show_physics"] = true;
+				fmp->childSetValue("show_physics", true);
 			}
 		}
 		else
 		{
 			fmp->disableViewOption("show_physics");
 			mViewOption["show_physics"] = false;
+			fmp->childSetValue("show_physics", false);
 
 		}
 
@@ -4313,7 +4448,7 @@ void LLModelPreview::updateStatusMessages()
 
 		//fmp->childSetEnabled("physics_optimize", !use_hull);
 
-		bool enable = phys_tris > 0 || phys_hulls > 0;
+		bool enable = (phys_tris > 0 || phys_hulls > 0) && fmp->mCurRequest.empty();
 		//enable = enable && !use_hull && fmp->childGetValue("physics_optimize").asBoolean();
 
 		//enable/disable "analysis" UI
@@ -4325,7 +4460,7 @@ void LLModelPreview::updateStatusMessages()
 			child = panel->findNextSibling(child);
 		}
 
-		enable = phys_hulls > 0;
+		enable = phys_hulls > 0 && fmp->mCurRequest.empty();
 		//enable/disable "simplification" UI
 		panel = fmp->getChild<LLPanel>("physics simplification");
 		child = panel->getFirstChild();
@@ -4352,151 +4487,155 @@ void LLModelPreview::updateStatusMessages()
 				fmp->childEnable("Decompose");
 			}
 		}
+		else
+		{
+			fmp->childEnable("simplify_cancel");
+			fmp->childEnable("decompose_cancel");
+		}
+	}
+
+	if (mFMP->childGetValue("physics_lod_combo").asString() == "From file")
+	{
+		mFMP->childEnable("physics_file");
+		mFMP->childEnable("physics_browse");
+	}
+	else
+	{
+		mFMP->childDisable("physics_file");
+		mFMP->childDisable("physics_browse");
+	}
+
+	LLSpinCtrl* crease = mFMP->getChild<LLSpinCtrl>("crease_angle");
+	
+	if (mRequestedCreaseAngle[mPreviewLOD] == -1.f)
+	{
+		mFMP->childSetColor("crease_label", LLColor4::grey);
+		crease->forceSetValue(75.f);
+	}
+	else
+	{
+		mFMP->childSetColor("crease_label", LLColor4::white);
+		crease->forceSetValue(mRequestedCreaseAngle[mPreviewLOD]);
+	}
+
+	mModelUpdatedSignal(true);
+
+}
+
+void LLModelPreview::updateLodControls(S32 lod)
+{
+	if (lod < LLModel::LOD_IMPOSTOR || lod > LLModel::LOD_HIGH)
+	{
+		llwarns << "Invalid level of detail: " << lod << llendl;
+		assert(lod >= LLModel::LOD_IMPOSTOR && lod <= LLModel::LOD_HIGH);
+		return;
 	}
 
 	const char* lod_controls[] =
 	{
-		"lod_mode",
-		"lod_triangle_limit",
-		"lod_error_tolerance",
-		"build_operator_text",
-		"queue_mode_text",
-		"border_mode_text",
-		"share_tolerance_text",
-		"build_operator",
-		"queue_mode",
-		"border_mode",
-		"share_tolerance"
+		"lod_mode_",
+		"lod_triangle_limit_",
+		"lod_error_threshold_"
 	};
 	const U32 num_lod_controls = sizeof(lod_controls)/sizeof(char*);
 
 	const char* file_controls[] =
 	{
-		"lod_browse",
-		"lod_file"
+		"lod_browse_",
+		"lod_file_",
 	};
 	const U32 num_file_controls = sizeof(file_controls)/sizeof(char*);
 
-	if (fmp)
+	LLFloaterModelPreview* fmp = LLFloaterModelPreview::sInstance;
+	if (!fmp) return;
+
+	LLComboBox* lod_combo = mFMP->findChild<LLComboBox>("lod_source_" + lod_name[lod]);
+	if (!lod_combo) return;
+
+	S32 lod_mode = lod_combo->getCurrentIndex();
+	if (lod_mode == 0) // LoD from file
 	{
-		//enable/disable controls based on radio groups
-		if (mFMP->childGetValue("lod_from_file").asBoolean())
-		{ 
-			fmp->mLODMode[mPreviewLOD] = 0;
-			for (U32 i = 0; i < num_file_controls; ++i)
-			{
-				mFMP->childEnable(file_controls[i]);
-			}
+		fmp->mLODMode[lod] = 0;
+		for (U32 i = 0; i < num_file_controls; ++i)
+		{
+			mFMP->childShow(file_controls[i] + lod_name[lod]);
+		}
 
-			for (U32 i = 0; i < num_lod_controls; ++i)
-			{
-				mFMP->childDisable(lod_controls[i]);
-			}
+		for (U32 i = 0; i < num_lod_controls; ++i)
+		{
+			mFMP->childHide(lod_controls[i] + lod_name[lod]);
 		}
-		else if (mFMP->childGetValue("lod_none").asBoolean())
+	}
+	else if (lod_mode == 2) // use LoD above
+	{
+		fmp->mLODMode[lod] = 2;
+		for (U32 i = 0; i < num_file_controls; ++i)
 		{
-			fmp->mLODMode[mPreviewLOD] = 2;
-			for (U32 i = 0; i < num_file_controls; ++i)
-			{
-				mFMP->childDisable(file_controls[i]);
-			}
+			mFMP->childHide(file_controls[i] + lod_name[lod]);
+		}
 
-			for (U32 i = 0; i < num_lod_controls; ++i)
-			{
-				mFMP->childDisable(lod_controls[i]);
-			}
+		for (U32 i = 0; i < num_lod_controls; ++i)
+		{
+			mFMP->childHide(lod_controls[i] + lod_name[lod]);
+		}
 
-			if (!mModel[mPreviewLOD].empty())
-			{
-				mModel[mPreviewLOD].clear();
-				mScene[mPreviewLOD].clear();
-				mVertexBuffer[mPreviewLOD].clear();
+		if (lod < LLModel::LOD_HIGH)
+		{
+			mModel[lod] = mModel[lod + 1];
+			mScene[lod] = mScene[lod + 1];
+			mVertexBuffer[lod].clear();
 
-				//this can cause phasing issues with the UI, so reenter this function and return
-				updateStatusMessages();
-				return;
+			// Also update lower LoD
+			if (lod > LLModel::LOD_IMPOSTOR)
+			{
+				updateLodControls(lod - 1);
 			}
 		}
-		else
-		{	// auto generate, also the default case for wizard which has no radio selection
-			fmp->mLODMode[mPreviewLOD] = 1;
+	}
+	else // auto generate, the default case for all LoDs except High
+	{
+		fmp->mLODMode[lod] = 1;
 
-			//don't actually regenerate lod when refreshing UI
-			mLODFrozen = true;
+		//don't actually regenerate lod when refreshing UI
+		mLODFrozen = true;
 
-			for (U32 i = 0; i < num_file_controls; ++i)
-			{
-				mFMP->childDisable(file_controls[i]);
-			}
+		for (U32 i = 0; i < num_file_controls; ++i)
+		{
+			mFMP->childHide(file_controls[i] + lod_name[lod]);
+		}
 
-			for (U32 i = 0; i < num_lod_controls; ++i)
-			{
-				mFMP->childEnable(lod_controls[i]);
-			}
+		for (U32 i = 0; i < num_lod_controls; ++i)
+		{
+			mFMP->childShow(lod_controls[i] + lod_name[lod]);
+		}
 
-			//if (threshold)
-			{	
-				LLSpinCtrl* threshold = mFMP->getChild<LLSpinCtrl>("lod_error_threshold");
-				LLSpinCtrl* limit = mFMP->getChild<LLSpinCtrl>("lod_triangle_limit");
 
-				limit->setMaxValue(mMaxTriangleLimit);
-				limit->forceSetValue(mRequestedTriangleCount[mPreviewLOD]);
+		LLSpinCtrl* threshold = mFMP->getChild<LLSpinCtrl>("lod_error_threshold_" + lod_name[lod]);
+		LLSpinCtrl* limit = mFMP->getChild<LLSpinCtrl>("lod_triangle_limit_" + lod_name[lod]);
 
-				threshold->forceSetValue(mRequestedErrorThreshold[mPreviewLOD]);
+		limit->setMaxValue(mMaxTriangleLimit);
+		limit->forceSetValue(mRequestedTriangleCount[lod]);
 
-				mFMP->getChild<LLComboBox>("lod_mode")->selectNthItem(mRequestedLoDMode[mPreviewLOD]);
-				mFMP->getChild<LLComboBox>("build_operator")->selectNthItem(mRequestedBuildOperator[mPreviewLOD]);
-				mFMP->getChild<LLComboBox>("queue_mode")->selectNthItem(mRequestedQueueMode[mPreviewLOD]);
-				mFMP->getChild<LLComboBox>("border_mode")->selectNthItem(mRequestedBorderMode[mPreviewLOD]);
-				mFMP->getChild<LLSpinCtrl>("share_tolerance")->setValue(mRequestedShareTolerance[mPreviewLOD]);
+		threshold->forceSetValue(mRequestedErrorThreshold[lod]);
 
-				if (mRequestedLoDMode[mPreviewLOD] == 0)
-				{
-					limit->setVisible(true);
-					threshold->setVisible(false);
+		mFMP->getChild<LLComboBox>("lod_mode_" + lod_name[lod])->selectNthItem(mRequestedLoDMode[lod]);
 
-					limit->setMaxValue(mMaxTriangleLimit);
-					limit->setIncrement(mMaxTriangleLimit/32);
-				}
-				else
-				{
-					limit->setVisible(false);
-					threshold->setVisible(true);
-				}
-			}
+		if (mRequestedLoDMode[lod] == 0)
+		{
+			limit->setVisible(true);
+			threshold->setVisible(false);
 
-			mLODFrozen = false;
+			limit->setMaxValue(mMaxTriangleLimit);
+			limit->setIncrement(mMaxTriangleLimit/32);
+		}
+		else
+		{
+			limit->setVisible(false);
+			threshold->setVisible(true);
 		}
-	}
-
-	if (mFMP->childGetValue("physics_load_from_file").asBoolean())
-	{
-		mFMP->childDisable("physics_lod_combo");
-		mFMP->childEnable("physics_file");
-		mFMP->childEnable("physics_browse");
-	}
-	else
-	{
-		mFMP->childEnable("physics_lod_combo");
-		mFMP->childDisable("physics_file");
-		mFMP->childDisable("physics_browse");
-	}
 
-	LLSpinCtrl* crease = mFMP->getChild<LLSpinCtrl>("crease_angle");
-	
-	if (mRequestedCreaseAngle[mPreviewLOD] == -1.f)
-	{
-		mFMP->childSetColor("crease_label", LLColor4::grey);
-		crease->forceSetValue(75.f);
-	}
-	else
-	{
-		mFMP->childSetColor("crease_label", LLColor4::white);
-		crease->forceSetValue(mRequestedCreaseAngle[mPreviewLOD]);
+		mLODFrozen = false;
 	}
-
-	mModelUpdatedSignal(true);
-
 }
 
 void LLModelPreview::setPreviewTarget(F32 distance)
@@ -4703,6 +4842,42 @@ void LLModelPreview::createPreviewAvatar( void )
 	}
 }
 
+void LLModelPreview::addEmptyFace( LLModel* pTarget )
+{
+	U32 type_mask = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_NORMAL | LLVertexBuffer::MAP_TEXCOORD0;
+	
+	LLPointer<LLVertexBuffer> buff = new LLVertexBuffer(type_mask, 0);
+	
+	buff->allocateBuffer(1, 3, true);
+	memset( buff->getMappedData(), 0, buff->getSize() );
+	memset( buff->getIndicesPointer(), 0, buff->getIndicesSize() );
+		
+	buff->validateRange( 0, buff->getNumVerts()-1, buff->getNumIndices(), 0 );
+		
+	LLStrider<LLVector3> pos;
+	LLStrider<LLVector3> norm;
+	LLStrider<LLVector2> tc;
+	LLStrider<U16> index;
+		
+	buff->getVertexStrider(pos);
+		
+	if ( type_mask & LLVertexBuffer::MAP_NORMAL )
+	{
+		buff->getNormalStrider(norm);
+	}
+	if ( type_mask & LLVertexBuffer::MAP_TEXCOORD0 )
+	{
+		buff->getTexCoord0Strider(tc);
+	}
+		
+	buff->getIndexStrider(index);
+		
+	//resize face array
+	int faceCnt = pTarget->getNumVolumeFaces();
+	pTarget->setNumVolumeFaces( faceCnt+1 );	
+	pTarget->setVolumeFaceData( faceCnt+1, pos, norm, tc, index, buff->getNumVerts(), buff->getNumIndices() );
+	
+}	
 //-----------------------------------------------------------------------------
 // render()
 //-----------------------------------------------------------------------------
@@ -4784,12 +4959,12 @@ BOOL LLModelPreview::render()
 
 	if (has_skin_weights)
 	{ //model has skin weights, enable view options for skin weights and joint positions
-		if (fmp)
+		if (fmp && isLegacyRigValid() )
 		{
 			fmp->enableViewOption("show_skin_weight");
 			fmp->setViewOptionEnabled("show_joint_positions", skin_weight);	
+			mFMP->childEnable("upload_skin");
 		}
-		mFMP->childEnable("upload_skin");
 	}
 	else
 	{
@@ -4814,8 +4989,12 @@ BOOL LLModelPreview::render()
 		mFMP->childSetValue("upload_joints", false);
 		upload_joints = false;		
 	}	
-	
-	mFMP->childSetEnabled("upload_joints", upload_skin);
+		
+	//Only enable joint offsets if it passed the earlier critiquing
+	if ( isRigValidForJointPositionUpload() )  
+	{
+		mFMP->childSetEnabled("upload_joints", upload_skin);
+	}
 
 	F32 explode = mFMP->childGetValue("physics_explode").asReal();
 
@@ -4869,6 +5048,8 @@ BOOL LLModelPreview::render()
 													  target_pos);											// point of interest
 
 
+	z_near = llclamp(z_far * 0.001f, 0.001f, 0.1f);
+
 	LLViewerCamera::getInstance()->setPerspective(FALSE, mOrigin.mX, mOrigin.mY, width, height, FALSE, z_near, z_far);
 
 	stop_glerror();
@@ -4908,8 +5089,13 @@ BOOL LLModelPreview::render()
 			{
 				for (U32 j = 0; j < mBaseModel.size(); ++j)
 				{
-					mModel[i][j]->matchMaterialOrder(mBaseModel[j]);
-					llassert(mModel[i][j]->mMaterialList == mBaseModel[j]->mMaterialList);
+					int refFaceCnt = 0;
+					int modelFaceCnt = 0;
+										
+					if ( !mModel[i][j]->matchMaterialOrder(mBaseModel[j], refFaceCnt, modelFaceCnt ) )
+					{
+						mFMP->childDisable( "calculate_btn" );
+					}
 				}
 			}
 		}
@@ -4945,18 +5131,20 @@ BOOL LLModelPreview::render()
 
 					if (textures)
 					{
-						const std::string& binding = instance.mModel->mMaterialList[i];
-						const LLImportMaterial& material = instance.mMaterial[binding];
-
-						llassert(binding == model->mMaterialList[i]);
-						
-						glColor4fv(material.mDiffuseColor.mV);
-						if (material.mDiffuseMap.notNull())
+						int materialCnt = instance.mModel->mMaterialList.size();
+						if ( i < materialCnt )
 						{
-							if (material.mDiffuseMap->getDiscardLevel() > -1)
+							const std::string& binding = instance.mModel->mMaterialList[i];						
+							const LLImportMaterial& material = instance.mMaterial[binding];
+
+							glColor4fv(material.mDiffuseColor.mV);
+							if (material.mDiffuseMap.notNull())
 							{
-								gGL.getTexUnit(0)->bind(material.mDiffuseMap, true);
-								mTextureSet.insert(material.mDiffuseMap.get());
+								if (material.mDiffuseMap->getDiscardLevel() > -1)
+								{
+									gGL.getTexUnit(0)->bind(material.mDiffuseMap, true);
+									mTextureSet.insert(material.mDiffuseMap.get());
+								}
 							}
 						}
 					}
@@ -4984,184 +5172,197 @@ BOOL LLModelPreview::render()
 			if (physics)
 			{
 				glClear(GL_DEPTH_BUFFER_BIT);
-				LLGLEnable blend(GL_BLEND);
-				gGL.blendFunc(LLRender::BF_ONE, LLRender::BF_ZERO);
-
-				for (LLMeshUploadThread::instance_list::iterator iter = mUploadData.begin(); iter != mUploadData.end(); ++iter)
+				
+				for (U32 i = 0; i < 2; i++)
 				{
-					LLModelInstance& instance = *iter;
+					if (i == 0)
+					{ //depth only pass
+						gGL.setColorMask(false, false);
+					}
+					else
+					{
+						gGL.setColorMask(true, true);
+					}
 
-					LLModel* model = instance.mLOD[LLModel::LOD_PHYSICS];
+					//enable alpha blending on second pass but not first pass
+					LLGLState blend(GL_BLEND, i); 
+					
+					gGL.blendFunc(LLRender::BF_SOURCE_ALPHA, LLRender::BF_ONE_MINUS_SOURCE_ALPHA);
 
-					if (!model)
+					for (LLMeshUploadThread::instance_list::iterator iter = mUploadData.begin(); iter != mUploadData.end(); ++iter)
 					{
-						continue;
-					}
+						LLModelInstance& instance = *iter;
 
-					gGL.pushMatrix();
-					LLMatrix4 mat = instance.mTransform;
+						LLModel* model = instance.mLOD[LLModel::LOD_PHYSICS];
 
-					glMultMatrixf((GLfloat*) mat.mMatrix);
+						if (!model)
+						{
+							continue;
+						}
 
+						gGL.pushMatrix();
+						LLMatrix4 mat = instance.mTransform;
 
-					bool render_mesh = true;
+						glMultMatrixf((GLfloat*) mat.mMatrix);
 
-					LLPhysicsDecomp* decomp = gMeshRepo.mDecompThread;
-					if (decomp)
-					{
-						LLMutexLock(decomp->mMutex);
 
-						LLModel::Decomposition& physics = model->mPhysics;
+						bool render_mesh = true;
 
-						if (!physics.mHull.empty())
+						LLPhysicsDecomp* decomp = gMeshRepo.mDecompThread;
+						if (decomp)
 						{
-							render_mesh = false;
+							LLMutexLock(decomp->mMutex);
 
-							if (physics.mMesh.empty())
-							{ //build vertex buffer for physics mesh
-								gMeshRepo.buildPhysicsMesh(physics);
-							}
+							LLModel::Decomposition& physics = model->mPhysics;
+
+							if (!physics.mHull.empty())
+							{
+								render_mesh = false;
+
+								if (physics.mMesh.empty())
+								{ //build vertex buffer for physics mesh
+									gMeshRepo.buildPhysicsMesh(physics);
+								}
 						
-							if (!physics.mMesh.empty())
-							{ //render hull instead of mesh
-								for (U32 i = 0; i < physics.mMesh.size(); ++i)
-								{
-									if (explode > 0.f)
+								if (!physics.mMesh.empty())
+								{ //render hull instead of mesh
+									for (U32 i = 0; i < physics.mMesh.size(); ++i)
 									{
-										gGL.pushMatrix();
+										if (explode > 0.f)
+										{
+											gGL.pushMatrix();
 
-										LLVector3 offset = model->mHullCenter[i]-model->mCenterOfHullCenters;
-										offset *= explode;
+											LLVector3 offset = model->mHullCenter[i]-model->mCenterOfHullCenters;
+											offset *= explode;
 
-										gGL.translatef(offset.mV[0], offset.mV[1], offset.mV[2]);
-									}
+											gGL.translatef(offset.mV[0], offset.mV[1], offset.mV[2]);
+										}
 
-									static std::vector<LLColor4U> hull_colors;
+										static std::vector<LLColor4U> hull_colors;
 
-									if (i+1 >= hull_colors.size())
-									{
-										hull_colors.push_back(LLColor4U(rand()%128+127, rand()%128+127, rand()%128+127, 255));
-									}
+										if (i+1 >= hull_colors.size())
+										{
+											hull_colors.push_back(LLColor4U(rand()%128+127, rand()%128+127, rand()%128+127, 128));
+										}
 
 										glColor4ubv(hull_colors[i].mV);
-									LLVertexBuffer::drawArrays(LLRender::TRIANGLES, physics.mMesh[i].mPositions, physics.mMesh[i].mNormals);
+										LLVertexBuffer::drawArrays(LLRender::TRIANGLES, physics.mMesh[i].mPositions, physics.mMesh[i].mNormals);
 
-									if (explode > 0.f)
-									{
-										gGL.popMatrix();
+										if (explode > 0.f)
+										{
+											gGL.popMatrix();
+										}
 									}
 								}
 							}
 						}
-					}
 
-					if (render_mesh)
-					{
-						if (mVertexBuffer[LLModel::LOD_PHYSICS].empty())
-						{
-							genBuffers(LLModel::LOD_PHYSICS, false);
-						}
-						for (U32 i = 0; i < mVertexBuffer[LLModel::LOD_PHYSICS][model].size(); ++i)
+						if (render_mesh)
 						{
-							LLVertexBuffer* buffer = mVertexBuffer[LLModel::LOD_PHYSICS][model][i];
-
-							buffer->setBuffer(type_mask & buffer->getTypeMask());
+							if (mVertexBuffer[LLModel::LOD_PHYSICS].empty())
+							{
+								genBuffers(LLModel::LOD_PHYSICS, false);
+							}
+							for (U32 i = 0; i < mVertexBuffer[LLModel::LOD_PHYSICS][model].size(); ++i)
+							{
+								LLVertexBuffer* buffer = mVertexBuffer[LLModel::LOD_PHYSICS][model][i];
 
-							buffer->drawRange(LLRender::TRIANGLES, 0, buffer->getNumVerts()-1, buffer->getNumIndices(), 0);
-							gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-							glColor4f(0.4f, 0.4f, 0.0f, 0.4f);
+								gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+								glColor4f(0.4f, 0.4f, 0.0f, 0.4f);
 
-							buffer->drawRange(LLRender::TRIANGLES, 0, buffer->getNumVerts()-1, buffer->getNumIndices(), 0);
+								buffer->setBuffer(type_mask & buffer->getTypeMask());
+								buffer->drawRange(LLRender::TRIANGLES, 0, buffer->getNumVerts()-1, buffer->getNumIndices(), 0);
 
-							glColor3f(1.f, 1.f, 0.f);
+								glColor3f(1.f, 1.f, 0.f);
 
-							glLineWidth(2.f);
-							glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
-							buffer->drawRange(LLRender::TRIANGLES, 0, buffer->getNumVerts()-1, buffer->getNumIndices(), 0);
+								glLineWidth(2.f);
+								glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+								buffer->drawRange(LLRender::TRIANGLES, 0, buffer->getNumVerts()-1, buffer->getNumIndices(), 0);
 
-							glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-							glLineWidth(1.f);
+								glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+								glLineWidth(1.f);
+							}
 						}
-					}
 
-					gGL.popMatrix();
-				}
-
-				glLineWidth(3.f);
-				glPointSize(8.f);
-				gPipeline.enableLightsFullbright(LLColor4::white);
-				//show degenerate triangles
-				LLGLDepthTest depth(GL_TRUE, GL_TRUE, GL_ALWAYS);
-				LLGLDisable cull(GL_CULL_FACE);
-				glColor4f(1.f,0.f,0.f,1.f);
-				const LLVector4a scale(0.5f);
-
-				for (LLMeshUploadThread::instance_list::iterator iter = mUploadData.begin(); iter != mUploadData.end(); ++iter)
-				{
-					LLModelInstance& instance = *iter;
+						gGL.popMatrix();
+					}
 
-					LLModel* model = instance.mLOD[LLModel::LOD_PHYSICS];
+					glLineWidth(3.f);
+					glPointSize(8.f);
+					gPipeline.enableLightsFullbright(LLColor4::white);
+					//show degenerate triangles
+					LLGLDepthTest depth(GL_TRUE, GL_TRUE, GL_ALWAYS);
+					LLGLDisable cull(GL_CULL_FACE);
+					glColor4f(1.f,0.f,0.f,1.f);
+					const LLVector4a scale(0.5f);
 
-					if (!model)
+					for (LLMeshUploadThread::instance_list::iterator iter = mUploadData.begin(); iter != mUploadData.end(); ++iter)
 					{
-						continue;
-					}
+						LLModelInstance& instance = *iter;
 
-					gGL.pushMatrix();
-					LLMatrix4 mat = instance.mTransform;
+						LLModel* model = instance.mLOD[LLModel::LOD_PHYSICS];
 
-					glMultMatrixf((GLfloat*) mat.mMatrix);
+						if (!model)
+						{
+							continue;
+						}
 
+						gGL.pushMatrix();
+						LLMatrix4 mat = instance.mTransform;
 
-					LLPhysicsDecomp* decomp = gMeshRepo.mDecompThread;
-					if (decomp)
-					{
-						LLMutexLock(decomp->mMutex);
+						glMultMatrixf((GLfloat*) mat.mMatrix);
 
-						LLModel::Decomposition& physics = model->mPhysics;
 
-						if (physics.mHull.empty())
+						LLPhysicsDecomp* decomp = gMeshRepo.mDecompThread;
+						if (decomp)
 						{
-							if (mVertexBuffer[LLModel::LOD_PHYSICS].empty())
+							LLMutexLock(decomp->mMutex);
+
+							LLModel::Decomposition& physics = model->mPhysics;
+
+							if (physics.mHull.empty())
 							{
-								genBuffers(LLModel::LOD_PHYSICS, false);
-							}
+								if (mVertexBuffer[LLModel::LOD_PHYSICS].empty())
+								{
+									genBuffers(LLModel::LOD_PHYSICS, false);
+								}
 							
-							for (U32 i = 0; i < mVertexBuffer[LLModel::LOD_PHYSICS][model].size(); ++i)
-							{
-								LLVertexBuffer* buffer = mVertexBuffer[LLModel::LOD_PHYSICS][model][i];
+								for (U32 i = 0; i < mVertexBuffer[LLModel::LOD_PHYSICS][model].size(); ++i)
+								{
+									LLVertexBuffer* buffer = mVertexBuffer[LLModel::LOD_PHYSICS][model][i];
 
-								buffer->setBuffer(type_mask & buffer->getTypeMask());
+									buffer->setBuffer(type_mask & buffer->getTypeMask());
 
-								LLStrider<LLVector3> pos_strider; 
-								buffer->getVertexStrider(pos_strider, 0);
-								LLVector4a* pos = (LLVector4a*) pos_strider.get();
+									LLStrider<LLVector3> pos_strider; 
+									buffer->getVertexStrider(pos_strider, 0);
+									LLVector4a* pos = (LLVector4a*) pos_strider.get();
 							
-								LLStrider<U16> idx;
-								buffer->getIndexStrider(idx, 0);
-
-								for (U32 i = 0; i < buffer->getNumIndices(); i += 3)
-								{
-									LLVector4a v1; v1.setMul(pos[*idx++], scale);
-									LLVector4a v2; v2.setMul(pos[*idx++], scale);
-									LLVector4a v3; v3.setMul(pos[*idx++], scale);
+									LLStrider<U16> idx;
+									buffer->getIndexStrider(idx, 0);
 
-									if (ll_is_degenerate(v1,v2,v3))
+									for (U32 i = 0; i < buffer->getNumIndices(); i += 3)
 									{
-										buffer->draw(LLRender::LINE_LOOP, 3, i);
-										buffer->draw(LLRender::POINTS, 3, i);
+										LLVector4a v1; v1.setMul(pos[*idx++], scale);
+										LLVector4a v2; v2.setMul(pos[*idx++], scale);
+										LLVector4a v3; v3.setMul(pos[*idx++], scale);
+
+										if (ll_is_degenerate(v1,v2,v3))
+										{
+											buffer->draw(LLRender::LINE_LOOP, 3, i);
+											buffer->draw(LLRender::POINTS, 3, i);
+										}
 									}
 								}
 							}
 						}
-					}
 
-					gGL.popMatrix();
+						gGL.popMatrix();
+					}
+					glLineWidth(1.f);
+					glPointSize(1.f);
+					gPipeline.enableLightsPreview();
+					gGL.setSceneBlendType(LLRender::BT_ALPHA);
 				}
-				glLineWidth(1.f);
-				glPointSize(1.f);
-				gPipeline.enableLightsPreview();
-				gGL.setSceneBlendType(LLRender::BT_ALPHA);
 			}
 		}
 		else
@@ -5328,8 +5529,7 @@ void LLModelPreview::setPreviewLOD(S32 lod)
 
 		LLComboBox* combo_box = mFMP->getChild<LLComboBox>("preview_lod_combo");
 		combo_box->setCurrentByIndex((NUM_LOD-1)-mPreviewLOD); // combo box list of lods is in reverse order
-		mFMP->childSetTextArg("lod_table_footer", "[DETAIL]", mFMP->getString(lod_name[mPreviewLOD]));
-		mFMP->childSetText("lod_file", mLODFile[mPreviewLOD]);
+		mFMP->childSetText("lod_file_" + lod_name[mPreviewLOD], mLODFile[mPreviewLOD]);
 
 		// the wizard has three lod drop downs
 		LLComboBox* combo_box2 = mFMP->getChild<LLComboBox>("preview_lod_combo2");
@@ -5350,25 +5550,16 @@ void LLModelPreview::setPreviewLOD(S32 lod)
 			mFMP->childSetColor(lod_triangles_name[i], color);
 			mFMP->childSetColor(lod_vertices_name[i], color);
 		}
-
-		LLFloaterModelPreview* fmp = LLFloaterModelPreview::sInstance;
-		if (fmp)
-		{
-			LLRadioGroup* radio = fmp->getChild<LLRadioGroup>("lod_file_or_limit");
-			radio->selectNthItem(fmp->mLODMode[mPreviewLOD]);
-		}
 	}
 	refresh();
 	updateStatusMessages();
 }
 
-//static
-void LLFloaterModelPreview::onBrowseLOD(void* data)
+void LLFloaterModelPreview::onBrowseLOD(S32 lod)
 {
 	assert_main_thread();
 
-	LLFloaterModelPreview* mp = (LLFloaterModelPreview*) data;
-	mp->loadModel(mp->mModelPreview->mPreviewLOD);
+	loadModel(lod);
 }
 
 //static
@@ -5380,6 +5571,7 @@ void LLFloaterModelPreview::onReset(void* user_data)
 	LLModelPreview* mp = fmp->mModelPreview;
 	std::string filename = mp->mLODFile[3]; 
 
+	fmp->resetDisplayOptions();
 	//reset model preview
 	fmp->initModelPreview();
 
@@ -5394,6 +5586,8 @@ void LLFloaterModelPreview::onUpload(void* user_data)
 
 	LLFloaterModelPreview* mp = (LLFloaterModelPreview*) user_data;
 
+	mp->mUploadBtn->setEnabled(false);
+
 	mp->mModelPreview->rebuildUploadData();
 
 	bool upload_skinweights = mp->childGetValue("upload_skin").asBoolean();
@@ -5407,8 +5601,7 @@ void LLFloaterModelPreview::onUpload(void* user_data)
 }
 
 
-//static
-void LLFloaterModelPreview::refresh(LLUICtrl* ctrl, void* user_data)
+void LLFloaterModelPreview::refresh()
 {
 	sInstance->toggleCalculateButton(true);
 	sInstance->mModelPreview->mDirty = true;
@@ -5429,12 +5622,11 @@ void LLModelPreview::textureLoadedCallback( BOOL success, LLViewerFetchedTexture
 	}
 }
 
-void LLModelPreview::onLODParamCommit(bool enforce_tri_limit)
+void LLModelPreview::onLODParamCommit(S32 lod, bool enforce_tri_limit)
 {
 	if (!mLODFrozen)
 	{
-		genLODs(mPreviewLOD, 3, enforce_tri_limit);
-		updateStatusMessages();
+		genLODs(lod, 3, enforce_tri_limit);
 		refresh();
 	}
 }
@@ -5475,11 +5667,6 @@ void LLFloaterModelPreview::toggleCalculateButton(bool visible)
 		{
 			mCalculateBtn->setVisible( false );
 		}
-		else
-		if ( !mModelPreview->isLegacyRigValid() )
-		{			
-			mCalculateBtn->setVisible( false );
-		}
 	}
 	
 	mUploadBtn->setVisible(!visible);
@@ -5488,10 +5675,10 @@ void LLFloaterModelPreview::toggleCalculateButton(bool visible)
 	if (visible)
 	{
 		std::string tbd = getString("tbd");
-		childSetTextArg("weights", "[EQ]", tbd);
-		childSetTextArg("weights", "[ST]", tbd);
-		childSetTextArg("weights", "[SIM]", tbd);
-		childSetTextArg("weights", "[PH]", tbd);
+		childSetTextArg("prim_weight", "[EQ]", tbd);
+		childSetTextArg("download_weight", "[ST]", tbd);
+		childSetTextArg("server_weight", "[SIM]", tbd);
+		childSetTextArg("physics_weight", "[PH]", tbd);
 		childSetTextArg("upload_fee", "[FEE]", tbd);
 		childSetTextArg("price_breakdown", "[STREAMING]", tbd);
 		childSetTextArg("price_breakdown", "[PHYSICS]", tbd);
@@ -5501,6 +5688,23 @@ void LLFloaterModelPreview::toggleCalculateButton(bool visible)
 	}
 }
 
+void LLFloaterModelPreview::onLoDSourceCommit(S32 lod)
+{
+	mModelPreview->updateLodControls(lod);
+	refresh();
+}
+
+void LLFloaterModelPreview::resetDisplayOptions()
+{
+	std::map<std::string,bool>::iterator option_it = mModelPreview->mViewOption.begin();
+
+	for(;option_it != mModelPreview->mViewOption.end(); ++option_it)
+	{
+		LLUICtrl* ctrl = getChild<LLUICtrl>(option_it->first);
+		ctrl->setValue(false);
+	}
+}
+
 void LLFloaterModelPreview::onModelPhysicsFeeReceived(const LLSD& result, std::string upload_url)
 {
 	mModelPhysicsFee = result;
@@ -5514,17 +5718,16 @@ void LLFloaterModelPreview::handleModelPhysicsFeeReceived()
 	const LLSD& result = mModelPhysicsFee;
 	mUploadModelUrl = result["url"].asString();
 
-	childSetTextArg("weights", "[EQ]", llformat("%0.3f", result["resource_cost"].asReal()));
-	childSetTextArg("weights", "[ST]", llformat("%0.3f", result["model_streaming_cost"].asReal()));
-	childSetTextArg("weights", "[SIM]", llformat("%0.3f", result["simulation_cost"].asReal()));
-	childSetTextArg("weights", "[PH]", llformat("%0.3f", result["physics_cost"].asReal()));
+	childSetTextArg("prim_weight", "[EQ]", llformat("%0.3f", result["resource_cost"].asReal()));
+	childSetTextArg("download_weight", "[ST]", llformat("%0.3f", result["model_streaming_cost"].asReal()));
+	childSetTextArg("server_weight", "[SIM]", llformat("%0.3f", result["simulation_cost"].asReal()));
+	childSetTextArg("physics_weight", "[PH]", llformat("%0.3f", result["physics_cost"].asReal()));
 	childSetTextArg("upload_fee", "[FEE]", llformat("%d", result["upload_price"].asInteger()));
 	childSetTextArg("price_breakdown", "[STREAMING]", llformat("%d", result["upload_price_breakdown"]["mesh_streaming"].asInteger()));
 	childSetTextArg("price_breakdown", "[PHYSICS]", llformat("%d", result["upload_price_breakdown"]["mesh_physics"].asInteger()));
 	childSetTextArg("price_breakdown", "[INSTANCES]", llformat("%d", result["upload_price_breakdown"]["mesh_instance"].asInteger()));
 	childSetTextArg("price_breakdown", "[TEXTURES]", llformat("%d", result["upload_price_breakdown"]["texture"].asInteger()));
 	childSetTextArg("price_breakdown", "[MODEL]", llformat("%d", result["upload_price_breakdown"]["model"].asInteger()));
-	childSetVisible("weights", true);
 	childSetVisible("upload_fee", true);
 	childSetVisible("price_breakdown", true);
 	mUploadBtn->setEnabled(mHasUploadPerm && !mUploadModelUrl.empty());
@@ -5532,20 +5735,23 @@ void LLFloaterModelPreview::handleModelPhysicsFeeReceived()
 
 void LLFloaterModelPreview::setModelPhysicsFeeErrorStatus(U32 status, const std::string& reason)
 {
-	toggleCalculateButton(true);
 	llwarns << "LLFloaterModelPreview::setModelPhysicsFeeErrorStatus(" << status << " : " << reason << ")" << llendl;
+	doOnIdleOneTime(boost::bind(&LLFloaterModelPreview::toggleCalculateButton, this, true));
 }
 
 /*virtual*/ 
 void LLFloaterModelPreview::onModelUploadSuccess()
 {
+	assert_main_thread();
 	closeFloater(false);
 }
 
 /*virtual*/ 
 void LLFloaterModelPreview::onModelUploadFailure()
 {
+	assert_main_thread();
 	toggleCalculateButton(true);
+	mUploadBtn->setEnabled(true);
 }
 
 S32 LLFloaterModelPreview::DecompRequest::statusCallback(const char* status, S32 p1, S32 p2)
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
index 3a5f7602fe..47de99ce25 100644
--- a/indra/newview/llfloatermodelpreview.h
+++ b/indra/newview/llfloatermodelpreview.h
@@ -120,12 +120,13 @@ public:
 	void processJointNode( domNode* pNode, std::map<std::string,LLMatrix4>& jointTransforms );
 	void extractTranslation( domTranslate* pTranslate, LLMatrix4& transform );
 	void extractTranslationViaElement( daeElement* pTranslateElement, LLMatrix4& transform );
-	
+	void extractTranslationViaSID( daeElement* pElement, LLMatrix4& transform );
+
 	void setLoadState(U32 state);
 
 	void buildJointToNodeMappingFromScene( daeElement* pRoot );
 	void processJointToNodeMapping( domNode* pNode );
-
+	void processChildJoints( domNode* pParentNode );
 
 	//map of avatar joints as named in COLLADA assets to internal joint names
 	std::map<std::string, std::string> mJointMap;
@@ -176,18 +177,18 @@ public:
 
 	void setDetails(F32 x, F32 y, F32 z, F32 streaming_cost, F32 physics_cost);
 	
-	static void onBrowseLOD(void* data);
+	void onBrowseLOD(S32 lod);
 	
 	static void onReset(void* data);
 
 	static void onUpload(void* data);
 	
-	static void refresh(LLUICtrl* ctrl, void* data);
+	void refresh();
 	
 	void			loadModel(S32 lod);
 	void 			loadModel(S32 lod, const std::string& file_name, bool force_disable_slm = false);
 	
-	void onViewOptionChecked(const LLSD& userdata);
+	void onViewOptionChecked(LLUICtrl* ctrl);
 	bool isViewOptionChecked(const LLSD& userdata);
 	bool isViewOptionEnabled(const LLSD& userdata);
 	void setViewOptionEnabled(const std::string& option, bool enabled);
@@ -217,17 +218,17 @@ protected:
 	static void		onPelvisOffsetCommit(LLUICtrl*, void*);
 	static void		onUploadJointsCommit(LLUICtrl*,void*);
 	static void		onUploadSkinCommit(LLUICtrl*,void*);
-	
-	static void		onPhysicsLoadRadioCommit(LLUICtrl*,void *data);
 
 	static void		onPreviewLODCommit(LLUICtrl*,void*);
 	
 	static void		onGenerateNormalsCommit(LLUICtrl*,void*);
 	
+	void toggleGenarateNormals();
+
 	static void		onAutoFillCommit(LLUICtrl*,void*);
-	static void		onLODParamCommit(LLUICtrl*,void*);
-	static void		onLODParamCommitTriangleLimit(LLUICtrl*,void*);
 	
+	void onLODParamCommit(S32 lod, bool enforce_tri_limit);
+
 	static void		onExplodeCommit(LLUICtrl*, void*);
 	
 	static void onPhysicsParamCommit(LLUICtrl* ctrl, void* userdata);
@@ -266,11 +267,9 @@ protected:
 	//store which lod mode each LOD is using
 	// 0 - load from file
 	// 1 - auto generate
-	// 2 - None
+	// 2 - use LoD above
 	S32 mLODMode[4];
 
-	LLMenuButton* mViewOptionMenuButton;
-	LLToggleableMenu* mViewOptionMenu;
 	LLMutex* mStatusLock;
 
 	LLSD mModelPhysicsFee;
@@ -279,9 +278,16 @@ private:
 	void onClickCalculateBtn();
 	void toggleCalculateButton();
 
+	void onLoDSourceCommit(S32 lod);
+
 	// Toggles between "Calculate weights & fee" and "Upload" buttons.
 	void toggleCalculateButton(bool visible);
 
+	// resets display options of model preview to their defaults.
+	void resetDisplayOptions();
+
+	void createSmoothComboBox(LLComboBox* combo_box, float min, float max);
+
 	LLButton* mUploadBtn;
 	LLButton* mCalculateBtn;
 };
@@ -334,9 +340,11 @@ public:
 	void saveUploadData(const std::string& filename, bool save_skinweights, bool save_joint_poisitions);
 	void clearIncompatible(S32 lod);
 	void updateStatusMessages();
+	void updateLodControls(S32 lod);
 	void clearGLODGroup();
-	void onLODParamCommit(bool enforce_tri_limit);
-
+	void onLODParamCommit(S32 lod, bool enforce_tri_limit);
+	void addEmptyFace( LLModel* pTarget );
+	
 	const bool getModelPivot( void ) const { return mHasPivot; }
 	void setHasPivot( bool val ) { mHasPivot = val; }
 	void setModelPivot( const LLVector3& pivot ) { mModelPivot = pivot; }
@@ -365,9 +373,6 @@ public:
 	
 	void setLoadState( U32 state ) { mLoadState = state; }
 	U32 getLoadState() { return mLoadState; }
-	//setRestJointFlag: If an asset comes through that changes the joints, we want the reset to persist
-	void setResetJointFlag( bool state ) { if ( !mResetJoints ) mResetJoints = state; }
-	const bool getResetJointFlag( void ) const { return mResetJoints; }
 	void setRigWithSceneParity( bool state ) { mRigParityWithScene = state; }
 	const bool getRigWithSceneParity( void ) const { return mRigParityWithScene; }
 	
diff --git a/indra/newview/llfloaterobjectweights.cpp b/indra/newview/llfloaterobjectweights.cpp
new file mode 100644
index 0000000000..0862cd2897
--- /dev/null
+++ b/indra/newview/llfloaterobjectweights.cpp
@@ -0,0 +1,266 @@
+/**
+ * @file llfloaterobjectweights.cpp
+ * @brief Object weights advanced view floater
+ *
+ * $LicenseInfo:firstyear=2011&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2011, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloaterobjectweights.h"
+
+#include "llparcel.h"
+
+#include "llfloaterreg.h"
+#include "lltextbox.h"
+
+#include "llagent.h"
+#include "llviewerparcelmgr.h"
+#include "llviewerregion.h"
+
+// virtual
+bool LLCrossParcelFunctor::apply(LLViewerObject* obj)
+{
+	// Add the root object box.
+	mBoundingBox.addBBoxAgent(LLBBox(obj->getPositionRegion(), obj->getRotationRegion(), obj->getScale() * -0.5f, obj->getScale() * 0.5f).getAxisAligned());
+
+	// Extend the bounding box across all the children.
+	LLViewerObject::const_child_list_t children = obj->getChildren();
+	for (LLViewerObject::const_child_list_t::const_iterator iter = children.begin();
+		 iter != children.end(); iter++)
+	{
+		LLViewerObject* child = *iter;
+		mBoundingBox.addBBoxAgent(LLBBox(child->getPositionRegion(), child->getRotationRegion(), child->getScale() * -0.5f, child->getScale() * 0.5f).getAxisAligned());
+	}
+
+	bool result = false;
+
+	LLViewerRegion* region = obj->getRegion();
+	if (region)
+	{
+		std::vector<LLBBox> boxes;
+		boxes.push_back(mBoundingBox);
+		result = region->objectsCrossParcel(boxes);
+	}
+
+	return result;
+}
+
+LLFloaterObjectWeights::LLFloaterObjectWeights(const LLSD& key)
+:	LLFloater(key),
+	mSelectedObjects(NULL),
+	mSelectedPrims(NULL),
+	mSelectedDownloadWeight(NULL),
+	mSelectedPhysicsWeight(NULL),
+	mSelectedServerWeight(NULL),
+	mSelectedDisplayWeight(NULL),
+	mSelectedOnLand(NULL),
+	mRezzedOnLand(NULL),
+	mRemainingCapacity(NULL),
+	mTotalCapacity(NULL)
+{
+}
+
+LLFloaterObjectWeights::~LLFloaterObjectWeights()
+{
+}
+
+// virtual
+BOOL LLFloaterObjectWeights::postBuild()
+{
+	mSelectedObjects = getChild<LLTextBox>("objects");
+	mSelectedPrims = getChild<LLTextBox>("prims");
+
+	mSelectedDownloadWeight = getChild<LLTextBox>("download");
+	mSelectedPhysicsWeight = getChild<LLTextBox>("physics");
+	mSelectedServerWeight = getChild<LLTextBox>("server");
+	mSelectedDisplayWeight = getChild<LLTextBox>("display");
+
+	mSelectedOnLand = getChild<LLTextBox>("selected");
+	mRezzedOnLand = getChild<LLTextBox>("rezzed_on_land");
+	mRemainingCapacity = getChild<LLTextBox>("remaining_capacity");
+	mTotalCapacity = getChild<LLTextBox>("total_capacity");
+
+	return TRUE;
+}
+
+// virtual
+void LLFloaterObjectWeights::onOpen(const LLSD& key)
+{
+	refresh();
+	updateLandImpacts(LLViewerParcelMgr::getInstance()->getFloatingParcelSelection()->getParcel());
+}
+
+// virtual
+void LLFloaterObjectWeights::onWeightsUpdate(const SelectionCost& selection_cost)
+{
+	mSelectedDownloadWeight->setText(llformat("%.1f", selection_cost.mNetworkCost));
+	mSelectedPhysicsWeight->setText(llformat("%.1f", selection_cost.mPhysicsCost));
+	mSelectedServerWeight->setText(llformat("%.1f", selection_cost.mSimulationCost));
+
+	S32 render_cost = LLSelectMgr::getInstance()->getSelection()->getSelectedObjectRenderCost();
+	mSelectedDisplayWeight->setText(llformat("%d", render_cost));
+
+	toggleWeightsLoadingIndicators(false);
+}
+
+//virtual
+void LLFloaterObjectWeights::setErrorStatus(U32 status, const std::string& reason)
+{
+	const std::string text = getString("nothing_selected");
+
+	mSelectedDownloadWeight->setText(text);
+	mSelectedPhysicsWeight->setText(text);
+	mSelectedServerWeight->setText(text);
+	mSelectedDisplayWeight->setText(text);
+
+	toggleWeightsLoadingIndicators(false);
+}
+
+void LLFloaterObjectWeights::updateLandImpacts(const LLParcel* parcel)
+{
+	if (!parcel || LLSelectMgr::getInstance()->getSelection()->isEmpty())
+	{
+		updateIfNothingSelected();
+	}
+	else
+	{
+		S32 rezzed_prims = parcel->getSimWidePrimCount();
+		S32 total_capacity = parcel->getSimWideMaxPrimCapacity();
+
+		mRezzedOnLand->setText(llformat("%d", rezzed_prims));
+		mRemainingCapacity->setText(llformat("%d", total_capacity - rezzed_prims));
+		mTotalCapacity->setText(llformat("%d", total_capacity));
+
+		toggleLandImpactsLoadingIndicators(false);
+	}
+}
+
+void LLFloaterObjectWeights::refresh()
+{
+	LLSelectMgr* sel_mgr = LLSelectMgr::getInstance();
+
+	if (sel_mgr->getSelection()->isEmpty())
+	{
+		updateIfNothingSelected();
+	}
+	else
+	{
+		S32 prim_count = sel_mgr->getSelection()->getObjectCount();
+		S32 link_count = sel_mgr->getSelection()->getRootObjectCount();
+		F32 prim_equiv = sel_mgr->getSelection()->getSelectedLinksetCost();
+
+		mSelectedObjects->setText(llformat("%d", link_count));
+		mSelectedPrims->setText(llformat("%d", prim_count));
+		mSelectedOnLand->setText(llformat("%.1d", (S32)prim_equiv));
+
+		LLCrossParcelFunctor func;
+		if (sel_mgr->getSelection()->applyToRootObjects(&func, true))
+		{
+			// Some of the selected objects cross parcel bounds.
+			// We don't display object weights and land impacts in this case.
+			const std::string text = getString("nothing_selected");
+
+			mRezzedOnLand->setText(text);
+			mRemainingCapacity->setText(text);
+			mTotalCapacity->setText(text);
+
+			toggleLandImpactsLoadingIndicators(false);
+		}
+
+		LLViewerRegion* region = gAgent.getRegion();
+		if (region && region->capabilitiesReceived())
+		{
+			for (LLObjectSelection::valid_root_iterator iter = sel_mgr->getSelection()->valid_root_begin();
+					iter != sel_mgr->getSelection()->valid_root_end(); ++iter)
+			{
+				LLAccountingCostManager::getInstance()->addObject((*iter)->getObject()->getID());
+			}
+
+			std::string url = region->getCapability("ResourceCostSelected");
+			if (!url.empty())
+			{
+				// Update the transaction id before the new fetch request
+				generateTransactionID();
+
+				LLAccountingCostManager::getInstance()->fetchCosts(Roots, url, getObserverHandle());
+				toggleWeightsLoadingIndicators(true);
+			}
+		}
+		else
+		{
+			llwarns << "Failed to get region capabilities" << llendl;
+		}
+	}
+}
+
+// virtual
+void LLFloaterObjectWeights::generateTransactionID()
+{
+	mTransactionID.generate();
+}
+
+void LLFloaterObjectWeights::toggleWeightsLoadingIndicators(bool visible)
+{
+	childSetVisible("download_loading_indicator", visible);
+	childSetVisible("physics_loading_indicator", visible);
+	childSetVisible("server_loading_indicator", visible);
+	childSetVisible("display_loading_indicator", visible);
+
+	mSelectedDownloadWeight->setVisible(!visible);
+	mSelectedPhysicsWeight->setVisible(!visible);
+	mSelectedServerWeight->setVisible(!visible);
+	mSelectedDisplayWeight->setVisible(!visible);
+}
+
+void LLFloaterObjectWeights::toggleLandImpactsLoadingIndicators(bool visible)
+{
+	childSetVisible("selected_loading_indicator", visible);
+	childSetVisible("rezzed_on_land_loading_indicator", visible);
+	childSetVisible("remaining_capacity_loading_indicator", visible);
+	childSetVisible("total_capacity_loading_indicator", visible);
+
+	mSelectedOnLand->setVisible(!visible);
+	mRezzedOnLand->setVisible(!visible);
+	mRemainingCapacity->setVisible(!visible);
+	mTotalCapacity->setVisible(!visible);
+}
+
+void LLFloaterObjectWeights::updateIfNothingSelected()
+{
+	const std::string text = getString("nothing_selected");
+
+	mSelectedObjects->setText(text);
+	mSelectedPrims->setText(text);
+
+	mSelectedDownloadWeight->setText(text);
+	mSelectedPhysicsWeight->setText(text);
+	mSelectedServerWeight->setText(text);
+	mSelectedDisplayWeight->setText(text);
+
+	mSelectedOnLand->setText(text);
+	mRezzedOnLand->setText(text);
+	mRemainingCapacity->setText(text);
+	mTotalCapacity->setText(text);
+
+	toggleWeightsLoadingIndicators(false);
+	toggleLandImpactsLoadingIndicators(false);
+}
diff --git a/indra/newview/llfloaterobjectweights.h b/indra/newview/llfloaterobjectweights.h
new file mode 100644
index 0000000000..9a244573be
--- /dev/null
+++ b/indra/newview/llfloaterobjectweights.h
@@ -0,0 +1,93 @@
+/**
+ * @file llfloaterobjectweights.h
+ * @brief Object weights advanced view floater
+ *
+ * $LicenseInfo:firstyear=2011&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2011, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLFLOATEROBJECTWEIGHTS_H
+#define LL_LLFLOATEROBJECTWEIGHTS_H
+
+#include "llfloater.h"
+
+#include "llaccountingcostmanager.h"
+#include "llselectmgr.h"
+
+class LLParcel;
+class LLTextBox;
+
+/**
+ * struct LLCrossParcelFunctor
+ *
+ * A functor that checks whether a bounding box for all
+ * selected objects crosses a region or parcel bounds.
+ */
+struct LLCrossParcelFunctor : public LLSelectedObjectFunctor
+{
+	/*virtual*/ bool apply(LLViewerObject* obj);
+
+private:
+	LLBBox	mBoundingBox;
+};
+
+
+class LLFloaterObjectWeights : public LLFloater, LLAccountingCostObserver
+{
+public:
+	LOG_CLASS(LLFloaterObjectWeights);
+
+	LLFloaterObjectWeights(const LLSD& key);
+	~LLFloaterObjectWeights();
+
+	/*virtual*/ BOOL postBuild();
+
+	/*virtual*/ void onOpen(const LLSD& key);
+
+	/*virtual*/ void onWeightsUpdate(const SelectionCost& selection_cost);
+	/*virtual*/ void setErrorStatus(U32 status, const std::string& reason);
+
+	void updateLandImpacts(const LLParcel* parcel);
+	void refresh();
+
+private:
+	/*virtual*/ void generateTransactionID();
+
+	void toggleWeightsLoadingIndicators(bool visible);
+	void toggleLandImpactsLoadingIndicators(bool visible);
+
+	void updateIfNothingSelected();
+
+	LLTextBox		*mSelectedObjects;
+	LLTextBox		*mSelectedPrims;
+
+	LLTextBox		*mSelectedDownloadWeight;
+	LLTextBox		*mSelectedPhysicsWeight;
+	LLTextBox		*mSelectedServerWeight;
+	LLTextBox		*mSelectedDisplayWeight;
+
+	LLTextBox		*mSelectedOnLand;
+	LLTextBox		*mRezzedOnLand;
+	LLTextBox		*mRemainingCapacity;
+	LLTextBox		*mTotalCapacity;
+};
+
+#endif //LL_LLFLOATEROBJECTWEIGHTS_H
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 47c86ae549..8412d37810 100755
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -304,7 +304,7 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
 	mOriginalIMViaEmail(false),
 	mLanguageChanged(false),
 	mAvatarDataInitialized(false),
-	mDoubleClickActionDirty(false)
+	mClickActionDirty(false)
 {
 	
 	//Build Floater is now Called from 	LLFloaterReg::add("preferences", "floater_preferences.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreference>);
@@ -348,8 +348,7 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
 	
 	sSkin = gSavedSettings.getString("SkinCurrent");
 
-	mCommitCallbackRegistrar.add("Pref.CommitDoubleClickChekbox",	boost::bind(&LLFloaterPreference::onDoubleClickCheckBox, this, _1));
-	mCommitCallbackRegistrar.add("Pref.CommitRadioDoubleClick",	boost::bind(&LLFloaterPreference::onDoubleClickRadio, this));
+	mCommitCallbackRegistrar.add("Pref.ClickActionChange",				boost::bind(&LLFloaterPreference::onClickActionChange, this));
 
 	gSavedSettings.getControl("NameTagShowUsernames")->getCommitSignal()->connect(boost::bind(&handleNameTagOptionChanged,  _2));	
 	gSavedSettings.getControl("NameTagShowFriends")->getCommitSignal()->connect(boost::bind(&handleNameTagOptionChanged,  _2));	
@@ -439,8 +438,6 @@ BOOL LLFloaterPreference::postBuild()
 	if (!tabcontainer->selectTab(gSavedSettings.getS32("LastPrefTab")))
 		tabcontainer->selectFirstTab();
 
-	updateDoubleClickControls();
-
 	getChild<LLUICtrl>("cache_location")->setEnabled(FALSE); // make it read-only but selectable (STORM-227)
 	std::string cache_location = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "");
 	setCacheLocation(cache_location);
@@ -581,10 +578,10 @@ void LLFloaterPreference::apply()
 
 	saveAvatarProperties();
 
-	if (mDoubleClickActionDirty)
+	if (mClickActionDirty)
 	{
-		updateDoubleClickSettings();
-		mDoubleClickActionDirty = false;
+		updateClickActionSettings();
+		mClickActionDirty = false;
 	}
 }
 
@@ -613,11 +610,12 @@ void LLFloaterPreference::cancel()
 	// reverts any changes to current skin
 	gSavedSettings.setString("SkinCurrent", sSkin);
 
-	if (mDoubleClickActionDirty)
+	if (mClickActionDirty)
 	{
-		updateDoubleClickControls();
-		mDoubleClickActionDirty = false;
+		updateClickActionControls();
+		mClickActionDirty = false;
 	}
+
 	LLFloaterPreferenceProxy * advanced_proxy_settings = LLFloaterReg::findTypedInstance<LLFloaterPreferenceProxy>("prefs_proxy");
 	if (advanced_proxy_settings)
 	{
@@ -682,6 +680,9 @@ void LLFloaterPreference::onOpen(const LLSD& key)
 	// Display selected maturity icons.
 	onChangeMaturity();
 	
+	// Load (double-)click to walk/teleport settings.
+	updateClickActionControls();
+	
 	// Enabled/disabled popups, might have been changed by user actions
 	// while preferences floater was closed.
 	buildPopupLists();
@@ -1499,72 +1500,34 @@ void LLFloaterPreference::onClickBlockList()
 	LLFloaterSidePanelContainer::showPanel("people", "panel_block_list_sidetray", LLSD());
 }
 
-void LLFloaterPreference::onDoubleClickCheckBox(LLUICtrl* ctrl)
+void LLFloaterPreference::onClickProxySettings()
 {
-	if (!ctrl) return;
-	mDoubleClickActionDirty = true;
-	LLRadioGroup* radio_double_click_action = getChild<LLRadioGroup>("double_click_action");
-	if (!radio_double_click_action) return;
-	// select default value("teleport") in radio-group.
-	radio_double_click_action->setSelectedIndex(0);
-	// set radio-group enabled depending on state of checkbox
-	radio_double_click_action->setEnabled(ctrl->getValue());
+	LLFloaterReg::showInstance("prefs_proxy");
 }
 
-void LLFloaterPreference::onDoubleClickRadio()
+void LLFloaterPreference::onClickActionChange()
 {
-	mDoubleClickActionDirty = true;
+	mClickActionDirty = true;
 }
 
-void LLFloaterPreference::updateDoubleClickSettings()
+void LLFloaterPreference::updateClickActionSettings()
 {
-	LLCheckBoxCtrl* double_click_action_cb = getChild<LLCheckBoxCtrl>("double_click_chkbox");
-	if (!double_click_action_cb) return;
-	bool enable = double_click_action_cb->getValue().asBoolean();
+	const int single_clk_action = getChild<LLComboBox>("single_click_action_combo")->getValue().asInteger();
+	const int double_clk_action = getChild<LLComboBox>("double_click_action_combo")->getValue().asInteger();
 
-	LLRadioGroup* radio_double_click_action = getChild<LLRadioGroup>("double_click_action");
-	if (!radio_double_click_action) return;
-	
-	// enable double click radio-group depending on state of checkbox
-	radio_double_click_action->setEnabled(enable);
-	
-	if (!enable)
-	{
-		// set double click action settings values to false if checkbox was unchecked
-		gSavedSettings.setBOOL("DoubleClickAutoPilot", false);
-		gSavedSettings.setBOOL("DoubleClickTeleport", false);
-	}
-	else
-	{
-		std::string selected = radio_double_click_action->getValue().asString();
-		bool teleport_selected = selected == "radio_teleport";
-		// set double click action settings values depending on chosen radio-button
-		gSavedSettings.setBOOL( "DoubleClickTeleport", teleport_selected );
-		gSavedSettings.setBOOL( "DoubleClickAutoPilot", !teleport_selected );
-	}
+	gSavedSettings.setBOOL("ClickToWalk",			single_clk_action == 1);
+	gSavedSettings.setBOOL("DoubleClickAutoPilot",	double_clk_action == 1);
+	gSavedSettings.setBOOL("DoubleClickTeleport",	double_clk_action == 2);
 }
 
-void LLFloaterPreference::onClickProxySettings()
+void LLFloaterPreference::updateClickActionControls()
 {
-	LLFloaterReg::showInstance("prefs_proxy");
-}
+	const bool click_to_walk = gSavedSettings.getBOOL("ClickToWalk");
+	const bool dbl_click_to_walk = gSavedSettings.getBOOL("DoubleClickAutoPilot");
+	const bool dbl_click_to_teleport = gSavedSettings.getBOOL("DoubleClickTeleport");
 
-void LLFloaterPreference::updateDoubleClickControls()
-{
-	// check is one of double-click actions settings enabled
-	bool double_click_action_enabled = gSavedSettings.getBOOL("DoubleClickAutoPilot") || gSavedSettings.getBOOL("DoubleClickTeleport");
-	LLCheckBoxCtrl* double_click_action_cb = getChild<LLCheckBoxCtrl>("double_click_chkbox");
-	if (double_click_action_cb)
-	{
-		// check checkbox if one of double-click actions settings enabled, uncheck otherwise
-		double_click_action_cb->setValue(double_click_action_enabled);
-	}
-	LLRadioGroup* double_click_action_radio = getChild<LLRadioGroup>("double_click_action");
-	if (!double_click_action_radio) return;
-	// set radio-group enabled if one of double-click actions settings enabled
-	double_click_action_radio->setEnabled(double_click_action_enabled);
-	// select button in radio-group depending on setting
-	double_click_action_radio->setSelectedIndex(gSavedSettings.getBOOL("DoubleClickAutoPilot"));
+	getChild<LLComboBox>("single_click_action_combo")->setValue((int)click_to_walk);
+	getChild<LLComboBox>("double_click_action_combo")->setValue(dbl_click_to_teleport ? 2 : (int)dbl_click_to_walk);
 }
 
 void LLFloaterPreference::applyUIColor(LLUICtrl* ctrl, const LLSD& param)
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index ef9bc2dd53..5c74e9f60c 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -104,14 +104,13 @@ protected:
 	void setHardwareDefaults();
 	// callback for when client turns on shaders
 	void onVertexShaderEnable();
-	// callback for changing double click action checkbox
-	void onDoubleClickCheckBox(LLUICtrl* ctrl);
-	// callback for selecting double click action radio-button
-	void onDoubleClickRadio();
-	// updates double-click action settings depending on controls from preferences
-	void updateDoubleClickSettings();
-	// updates double-click action controls depending on values from settings.xml
-	void updateDoubleClickControls();
+
+	// callback for commit in the "Single click on land" and "Double click on land" comboboxes.
+	void onClickActionChange();
+	// updates click/double-click action settings depending on controls values
+	void updateClickActionSettings();
+	// updates click/double-click action controls depending on values from settings.xml
+	void updateClickActionControls();
 	
 	// This function squirrels away the current values of the controls so that
 	// cancel() can restore them.	
@@ -164,9 +163,7 @@ public:
 	static void refreshSkin(void* data);
 private:
 	static std::string sSkin;
-	// set true if state of double-click action checkbox or radio-group was changed by user
-	// (reset back to false on apply or cancel)
-	bool mDoubleClickActionDirty;
+	bool mClickActionDirty; ///< Set to true when the click/double-click options get changed by user.
 	bool mGotPersonalInfo;
 	bool mOriginalIMViaEmail;
 	bool mLanguageChanged;
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 9a99417e93..676059779c 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -172,30 +172,9 @@ bool estate_dispatch_initialized = false;
 LLUUID LLFloaterRegionInfo::sRequestInvoice;
 
 
-void LLFloaterRegionInfo::onConsoleReplyReceived(const std::string& output)
-{
-	llwarns << "here is what they're giving us:  " << output << llendl;
-
-	if (output.find("FALSE") != std::string::npos)
-	{
-		getChild<LLUICtrl>("mesh_rez_enabled_check")->setValue(FALSE);
-	}
-	else
-	{
-		getChild<LLUICtrl>("mesh_rez_enabled_check")->setValue(TRUE);
-	}
-}
-
-
 LLFloaterRegionInfo::LLFloaterRegionInfo(const LLSD& seed)
 	: LLFloater(seed)
-{
-	mConsoleReplySignalConnection = LLFloaterRegionDebugConsole::setConsoleReplyCallback(
-	boost::bind(
-		&LLFloaterRegionInfo::onConsoleReplyReceived,
-		this,
-		_1));
-}
+{}
 
 BOOL LLFloaterRegionInfo::postBuild()
 {
@@ -246,9 +225,7 @@ BOOL LLFloaterRegionInfo::postBuild()
 }
 
 LLFloaterRegionInfo::~LLFloaterRegionInfo()
-{
-	mConsoleReplySignalConnection.disconnect();
-}
+{}
 
 void LLFloaterRegionInfo::onOpen(const LLSD& key)
 {
@@ -638,9 +615,6 @@ bool LLPanelRegionGeneralInfo::refreshFromRegion(LLViewerRegion* region)
 	getChildView("im_btn")->setEnabled(allow_modify);
 	getChildView("manage_telehub_btn")->setEnabled(allow_modify);
 
-	const bool enable_mesh = gMeshRepo.meshRezEnabled();
-	getChildView("mesh_rez_enabled_check")->setVisible(enable_mesh);
-	getChildView("mesh_rez_enabled_check")->setEnabled(getChildView("mesh_rez_enabled_check")->getEnabled() && enable_mesh);
 	// Data gets filled in by processRegionInfo
 
 	return LLPanelRegionInfo::refreshFromRegion(region);
@@ -659,7 +633,6 @@ BOOL LLPanelRegionGeneralInfo::postBuild()
 	initCtrl("access_combo");
 	initCtrl("restrict_pushobject");
 	initCtrl("block_parcel_search_check");
-	initCtrl("mesh_rez_enabled_check");
 
 	childSetAction("kick_btn", boost::bind(&LLPanelRegionGeneralInfo::onClickKick, this));
 	childSetAction("kick_all_btn", onClickKickAll, this);
@@ -875,27 +848,6 @@ BOOL LLPanelRegionGeneralInfo::sendUpdate()
 		sendEstateOwnerMessage(gMessageSystem, "setregioninfo", invoice, strings);
 	}
 
-	std::string sim_console_url = gAgent.getRegion()->getCapability("SimConsoleAsync");
-
-	if (!sim_console_url.empty())
-	{
-		std::string update_str = "set mesh_rez_enabled ";
-		if (getChild<LLUICtrl>("mesh_rez_enabled_check")->getValue().asBoolean())
-		{
-			update_str += "true";
-		}
-		else
-		{
-			update_str += "false";
-		}
-
-		LLHTTPClient::post(
-			sim_console_url,
-			LLSD(update_str),
-			new ConsoleUpdateResponder);
-	}
-
-
 	// if we changed access levels, tell user about it
 	LLViewerRegion* region = gAgent.getRegion();
 	if (region && (getChild<LLUICtrl>("access_combo")->getValue().asInteger() != region->getSimAccess()) )
diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h
index c1fef57ac9..c402de66e8 100644
--- a/indra/newview/llfloaterregioninfo.h
+++ b/indra/newview/llfloaterregioninfo.h
@@ -100,10 +100,6 @@ private:
 	
 	LLFloaterRegionInfo(const LLSD& seed);
 	~LLFloaterRegionInfo();
-
-	void onConsoleReplyReceived(const std::string& output);
-
-	boost::signals2::connection mConsoleReplySignalConnection;;
 	
 protected:
 	void onTabSelected(const LLSD& param);
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 84fb8bd9e7..1008b4a6e4 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -41,6 +41,7 @@
 #include "llfloaterbuildoptions.h"
 #include "llfloatermediasettings.h"
 #include "llfloateropenobject.h"
+#include "llfloaterobjectweights.h"
 #include "llfloaterreg.h"
 #include "llfocusmgr.h"
 #include "llmediaentry.h"
@@ -54,6 +55,7 @@
 #include "llpanelobject.h"
 #include "llpanelvolume.h"
 #include "llpanelpermissions.h"
+#include "llparcel.h"
 #include "llradiogroup.h"
 #include "llresmgr.h"
 #include "llselectmgr.h"
@@ -84,7 +86,6 @@
 #include "llviewerwindow.h"
 #include "llvovolume.h"
 #include "lluictrlfactory.h"
-#include "llaccountingquotamanager.h"
 #include "llmeshrepository.h"
 
 // Globals
@@ -118,6 +119,24 @@ void commit_radio_group_edit(LLUICtrl* ctrl);
 void commit_radio_group_land(LLUICtrl* ctrl);
 void commit_slider_zoom(LLUICtrl *ctrl);
 
+/**
+ * Class LLLandImpactsObserver
+ *
+ * An observer class to monitor parcel selection and update
+ * the land impacts data from a parcel containing the selected object.
+ */
+class LLLandImpactsObserver : public LLParcelObserver
+{
+public:
+	virtual void changed()
+	{
+		LLFloaterTools* tools_floater = LLFloaterReg::getTypedInstance<LLFloaterTools>("build");
+		if(tools_floater)
+		{
+			tools_floater->updateLandImpacts();
+		}
+	}
+};
 
 //static
 void*	LLFloaterTools::createPanelPermissions(void* data)
@@ -345,6 +364,9 @@ LLFloaterTools::LLFloaterTools(const LLSD& key)
 
 	mCostTextBorder(NULL),
 	mTabLand(NULL),
+
+	mLandImpactsObserver(NULL),
+
 	mDirty(TRUE),
 	mNeedMediaTitle(TRUE)
 {
@@ -376,12 +398,17 @@ LLFloaterTools::LLFloaterTools(const LLSD& key)
 	mCommitCallbackRegistrar.add("BuildTool.LinkObjects",		boost::bind(&LLSelectMgr::linkObjects, LLSelectMgr::getInstance()));
 	mCommitCallbackRegistrar.add("BuildTool.UnlinkObjects",		boost::bind(&LLSelectMgr::unlinkObjects, LLSelectMgr::getInstance()));
 
+	mLandImpactsObserver = new LLLandImpactsObserver();
+	LLViewerParcelMgr::getInstance()->addObserver(mLandImpactsObserver);
 }
 
 LLFloaterTools::~LLFloaterTools()
 {
 	// children automatically deleted
 	gFloaterTools = NULL;
+
+	LLViewerParcelMgr::getInstance()->removeObserver(mLandImpactsObserver);
+	delete mLandImpactsObserver;
 }
 
 void LLFloaterTools::setStatusText(const std::string& text)
@@ -436,7 +463,8 @@ void LLFloaterTools::refresh()
 		if (sShowObjectCost)
 		{
 			std::string prim_cost_string;
-			LLResMgr::getInstance()->getIntegerString(prim_cost_string, calcRenderCost());
+			S32 render_cost = LLSelectMgr::getInstance()->getSelection()->getSelectedObjectRenderCost();
+			LLResMgr::getInstance()->getIntegerString(prim_cost_string, render_cost);
 			getChild<LLUICtrl>("RenderingCost")->setTextArg("[COUNT]", prim_cost_string);
 		}
 		
@@ -449,49 +477,44 @@ void LLFloaterTools::refresh()
 	else
 #endif
 	{
-		F32 link_phys_cost  = LLSelectMgr::getInstance()->getSelection()->getSelectedLinksetPhysicsCost();
 		F32 link_cost  = LLSelectMgr::getInstance()->getSelection()->getSelectedLinksetCost();
-		S32 prim_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
 		S32 link_count = LLSelectMgr::getInstance()->getSelection()->getRootObjectCount();
 
-		LLStringUtil::format_map_t selection_args;
-		selection_args["OBJ_COUNT"] = llformat("%.1d", link_count);
-		selection_args["PRIM_COUNT"] = llformat("%.1d", prim_count);
-
-		std::ostringstream selection_info;
-
-		bool show_adv_weight = gSavedSettings.getBOOL("ShowAdvancedBuilderOptions");
-		bool show_mesh_cost = gMeshRepo.meshRezEnabled();
-
-		if (show_mesh_cost)
+		LLCrossParcelFunctor func;
+		if (LLSelectMgr::getInstance()->getSelection()->applyToRootObjects(&func, true))
 		{
-			LLStringUtil::format_map_t prim_equiv_args;
-			prim_equiv_args["SEL_WEIGHT"] = llformat("%.1d", (S32)link_cost);
-			selection_args["PE_STRING"] = getString("status_selectprimequiv", prim_equiv_args);
+			// Selection crosses parcel bounds.
+			// We don't display remaining land capacity in this case.
+			const LLStringExplicit empty_str("");
+			childSetTextArg("remaining_capacity", "[CAPACITY_STRING]", empty_str);
 		}
 		else
 		{
-			selection_args["PE_STRING"] = "";
+			LLViewerObject* selected_object = mObjectSelection->getFirstObject();
+			if (selected_object)
+			{
+				// Select a parcel at the currently selected object's position.
+				LLViewerParcelMgr::getInstance()->selectParcelAt(selected_object->getPositionGlobal());
+			}
+			else
+			{
+				llwarns << "Failed to get selected object" << llendl;
+			}
 		}
 
-		selection_info << getString("status_selectcount", selection_args);
+		LLStringUtil::format_map_t selection_args;
+		selection_args["OBJ_COUNT"] = llformat("%.1d", link_count);
+		selection_args["LAND_IMPACT"] = llformat("%.1d", (S32)link_cost);
 
-		if (show_adv_weight)
-		{
-			selection_info << ",";
+		std::ostringstream selection_info;
+
+		selection_info << getString("status_selectcount", selection_args);
 
-			childSetTextArg("selection_weight", "[PHYS_WEIGHT]", llformat("%.1f", link_phys_cost));
-			childSetTextArg("selection_weight", "[DISP_WEIGHT]", llformat("%.1d", calcRenderCost()));
-		}
-		else
-		{
-			selection_info<<".";
-		}
 		getChild<LLTextBox>("selection_count")->setText(selection_info.str());
 
 		bool have_selection = !LLSelectMgr::getInstance()->getSelection()->isEmpty();
 		childSetVisible("selection_count",  have_selection);
-		childSetVisible("selection_weight", have_selection && show_adv_weight);
+		childSetVisible("remaining_capacity", have_selection);
 		childSetVisible("selection_empty", !have_selection);
 	}
 
@@ -504,6 +527,13 @@ void LLFloaterTools::refresh()
 	refreshMedia();
 	mPanelContents->refresh();
 	mPanelLandInfo->refresh();
+
+	// Refresh the advanced weights floater
+	LLFloaterObjectWeights* object_weights_floater = LLFloaterReg::getTypedInstance<LLFloaterObjectWeights>("object_weights");
+	if(object_weights_floater && object_weights_floater->getVisible())
+	{
+		object_weights_floater->refresh();
+	}
 }
 
 void LLFloaterTools::draw()
@@ -762,7 +792,7 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
 	bool have_selection = !LLSelectMgr::getInstance()->getSelection()->isEmpty();
 
 	getChildView("selection_count")->setVisible(!land_visible && have_selection);
-	getChildView("selection_weight")->setVisible(!land_visible && have_selection && gSavedSettings.getBOOL("ShowAdvancedBuilderOptions"));
+	getChildView("remaining_capacity")->setVisible(!land_visible && have_selection);
 	getChildView("selection_empty")->setVisible(!land_visible && !have_selection);
 	
 	mTab->setVisible(!land_visible);
@@ -826,6 +856,9 @@ void LLFloaterTools::onClose(bool app_quitting)
 
 	//gMenuBarView->setItemVisible("BuildTools", FALSE);
 	LLFloaterReg::hideInstance("media_settings");
+
+	// hide the advanced object weights floater
+	LLFloaterReg::hideInstance("object_weights");
 }
 
 void click_popup_info(void*)
@@ -1012,35 +1045,6 @@ void LLFloaterTools::onClickGridOptions()
 	//floaterp->addDependentFloater(LLFloaterBuildOptions::getInstance(), FALSE);
 }
 
-S32 LLFloaterTools::calcRenderCost()
-{
-       S32 cost = 0;
-       std::set<LLUUID> textures;
-
-       for (LLObjectSelection::iterator selection_iter = LLSelectMgr::getInstance()->getSelection()->begin();
-                 selection_iter != LLSelectMgr::getInstance()->getSelection()->end();
-                 ++selection_iter)
-       {
-               LLSelectNode *select_node = *selection_iter;
-               if (select_node)
-               {
-                       LLViewerObject *vobj = select_node->getObject();
-                       if (vobj->getVolume())
-                       {
-                               LLVOVolume* volume = (LLVOVolume*) vobj;
-
-                               cost += volume->getRenderCost(textures);
-							   cost += textures.size() * LLVOVolume::ARC_TEXTURE_COST;
-							   textures.clear();
-                       }
-               }
-       }
-
-
-       return cost;
-}
-
-
 // static
 void LLFloaterTools::setEditTool(void* tool_pointer)
 {
@@ -1116,6 +1120,37 @@ bool LLFloaterTools::selectedMediaEditable()
 	return selected_Media_editable;
 }
 
+void LLFloaterTools::updateLandImpacts()
+{
+	LLParcel *parcel = mParcelSelection->getParcel();
+	if (!parcel)
+	{
+		return;
+	}
+
+	S32 rezzed_prims = parcel->getSimWidePrimCount();
+	S32 total_capacity = parcel->getSimWideMaxPrimCapacity();
+
+	std::string remaining_capacity_str = "";
+
+	bool show_mesh_cost = gMeshRepo.meshRezEnabled();
+	if (show_mesh_cost)
+	{
+		LLStringUtil::format_map_t remaining_capacity_args;
+		remaining_capacity_args["LAND_CAPACITY"] = llformat("%d", total_capacity - rezzed_prims);
+		remaining_capacity_str = getString("status_remaining_capacity", remaining_capacity_args);
+	}
+
+	childSetTextArg("remaining_capacity", "[CAPACITY_STRING]", remaining_capacity_str);
+
+	// Update land impacts info in the weights floater
+	LLFloaterObjectWeights* object_weights_floater = LLFloaterReg::getTypedInstance<LLFloaterObjectWeights>("object_weights");
+	if(object_weights_floater)
+	{
+		object_weights_floater->updateLandImpacts(parcel);
+	}
+}
+
 void LLFloaterTools::getMediaState()
 {
 	LLObjectSelectionHandle selected_objects =LLSelectMgr::getInstance()->getSelection();
diff --git a/indra/newview/llfloatertools.h b/indra/newview/llfloatertools.h
index 69636190fc..63ed9dc82b 100644
--- a/indra/newview/llfloatertools.h
+++ b/indra/newview/llfloatertools.h
@@ -47,6 +47,7 @@ class LLMediaCtrl;
 class LLTool;
 class LLParcelSelection;
 class LLObjectSelection;
+class LLLandImpactsObserver;
 
 typedef LLSafeHandle<LLObjectSelection> LLObjectSelectionHandle;
 
@@ -103,6 +104,7 @@ public:
 	void updateMediaTitle();
 	void navigateToTitleMedia( const std::string url );
 	bool selectedMediaEditable();
+	void updateLandImpacts();
 
 private:
 	void refresh();
@@ -113,7 +115,6 @@ private:
 	static bool multipleFacesSelectedConfirm(const LLSD& notification, const LLSD& response);
 	static void setObjectType( LLPCode pcode );
 	void onClickGridOptions();
-	S32 calcRenderCost();
 
 public:
 	LLButton		*mBtnFocus;
@@ -181,6 +182,8 @@ public:
 
 	LLTabContainer*			mTabLand;
 
+	LLLandImpactsObserver*  mLandImpactsObserver;
+
 	LLParcelSelectionHandle	mParcelSelection;
 	LLObjectSelectionHandle	mObjectSelection;
 
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index fc594841e3..e12f140747 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -411,7 +411,6 @@ public:
 			cc = llsd_from_file("fake_upload_error.xml");
 		}
 
-		//assert_main_thread();
 		mThread->mPendingUploads--;
 		dump_llsd_to_file(cc,make_dump_name("whole_model_upload_response_",dump_num));
 		
@@ -1321,6 +1320,7 @@ void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures)
 
 	std::map<LLModel*,S32> mesh_index;
 	std::string model_name;
+	std::string model_metric;
 
 	S32 instance_num = 0;
 	
@@ -1342,6 +1342,11 @@ void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures)
 				model_name = data.mBaseModel->getName();
 			}
 
+			if (model_metric.empty())
+			{
+				model_metric = data.mBaseModel->getMetric();
+			}
+
 			std::stringstream ostr;
 			
 			LLModel::Decomposition& decomp =
@@ -1455,6 +1460,8 @@ void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures)
 
 	if (model_name.empty()) model_name = "mesh model";
 	result["name"] = model_name;
+	if (model_metric.empty()) model_metric = "MUT_Unspecified";
+	res["metric"] = model_metric;
 	result["asset_resources"] = res;
 	dump_llsd_to_file(result,make_dump_name("whole_model_",dump_num));
 
@@ -1463,51 +1470,57 @@ void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures)
 
 void LLMeshUploadThread::generateHulls()
 {
+	bool has_valid_requests = false ;
+
 	for (instance_map::iterator iter = mInstance.begin(); iter != mInstance.end(); ++iter)
-		{
-			LLMeshUploadData data;
-			data.mBaseModel = iter->first;
+	{
+		LLMeshUploadData data;
+		data.mBaseModel = iter->first;
 
-			LLModelInstance& instance = *(iter->second.begin());
+		LLModelInstance& instance = *(iter->second.begin());
 
-			for (S32 i = 0; i < 5; i++)
-			{
-				data.mModel[i] = instance.mLOD[i];
-			}
+		for (S32 i = 0; i < 5; i++)
+		{
+			data.mModel[i] = instance.mLOD[i];
+		}
 
-			//queue up models for hull generation
-			LLModel* physics = NULL;
+		//queue up models for hull generation
+		LLModel* physics = NULL;
 
-			if (data.mModel[LLModel::LOD_PHYSICS].notNull())
-			{
-				physics = data.mModel[LLModel::LOD_PHYSICS];
-			}
-			else if (data.mModel[LLModel::LOD_LOW].notNull())
-			{
-				physics = data.mModel[LLModel::LOD_LOW];
-			}
-			else if (data.mModel[LLModel::LOD_MEDIUM].notNull())
-			{
-				physics = data.mModel[LLModel::LOD_MEDIUM];
-			}
-			else
-			{
-				physics = data.mModel[LLModel::LOD_HIGH];
-			}
+		if (data.mModel[LLModel::LOD_PHYSICS].notNull())
+		{
+			physics = data.mModel[LLModel::LOD_PHYSICS];
+		}
+		else if (data.mModel[LLModel::LOD_LOW].notNull())
+		{
+			physics = data.mModel[LLModel::LOD_LOW];
+		}
+		else if (data.mModel[LLModel::LOD_MEDIUM].notNull())
+		{
+			physics = data.mModel[LLModel::LOD_MEDIUM];
+		}
+		else
+		{
+			physics = data.mModel[LLModel::LOD_HIGH];
+		}
 
-			llassert(physics != NULL);
+		llassert(physics != NULL);
 
-			DecompRequest* request = new DecompRequest(physics, data.mBaseModel, this);
-			if(request->isValid())
-			{
-				gMeshRepo.mDecompThread->submitRequest(request);
-			}
+		DecompRequest* request = new DecompRequest(physics, data.mBaseModel, this);
+		if(request->isValid())
+		{
+			gMeshRepo.mDecompThread->submitRequest(request);
+			has_valid_requests = true ;
 		}
-
+	}
+		
+	if(has_valid_requests)
+	{
 		while (!mPhysicsComplete)
 		{
 			apr_sleep(100);
 		}
+	}	
 }
 
 void LLMeshUploadThread::doWholeModelUpload()
@@ -1688,6 +1701,7 @@ void LLMeshRepository::cacheOutgoingMesh(LLMeshUploadData& data, LLSD& header)
 		{
 			LLPointer<LLVolume> volume = new LLVolume(volume_params, LLVolumeLODGroup::getVolumeScaleFromDetail(i));
 			volume->copyVolumeFaces(data.mModel[i]);
+			volume->setMeshAssetLoaded(TRUE);
 		}
 	}
 
@@ -2141,11 +2155,6 @@ S32 LLMeshRepository::loadMesh(LLVOVolume* vobj, const LLVolumeParams& mesh_para
 
 	if (volume)
 	{
-		if (volume->getNumVolumeFaces() == 0 && !volume->isTetrahedron())
-		{
-			volume->makeTetrahedron();
-		}
-
 		LLVolumeParams params = volume->getParams();
 
 		LLVolumeLODGroup* group = LLPrimitive::getVolumeManager()->getGroup(params);
@@ -2156,7 +2165,7 @@ S32 LLMeshRepository::loadMesh(LLVOVolume* vobj, const LLVolumeParams& mesh_para
 			if (last_lod >= 0)
 			{
 				LLVolume* lod = group->refLOD(last_lod);
-				if (lod && !lod->isTetrahedron() && lod->getNumVolumeFaces() > 0)
+				if (lod && lod->isMeshAssetLoaded() && lod->getNumVolumeFaces() > 0)
 				{
 					group->derefLOD(lod);
 					return last_lod;
@@ -2168,7 +2177,7 @@ S32 LLMeshRepository::loadMesh(LLVOVolume* vobj, const LLVolumeParams& mesh_para
 			for (S32 i = detail-1; i >= 0; --i)
 			{
 				LLVolume* lod = group->refLOD(i);
-				if (lod && !lod->isTetrahedron() && lod->getNumVolumeFaces() > 0)
+				if (lod && lod->isMeshAssetLoaded() && lod->getNumVolumeFaces() > 0)
 				{
 					group->derefLOD(lod);
 					return i;
@@ -2181,7 +2190,7 @@ S32 LLMeshRepository::loadMesh(LLVOVolume* vobj, const LLVolumeParams& mesh_para
 			for (S32 i = detail+1; i < 4; ++i)
 			{
 				LLVolume* lod = group->refLOD(i);
-				if (lod && !lod->isTetrahedron() && lod->getNumVolumeFaces() > 0)
+				if (lod && lod->isMeshAssetLoaded() && lod->getNumVolumeFaces() > 0)
 				{
 					group->derefLOD(lod);
 					return i;
@@ -2432,7 +2441,6 @@ void LLMeshRepository::notifyMeshLoaded(const LLVolumeParams& mesh_params, LLVol
 		if (volume->getNumVolumeFaces() <= 0)
 		{
 			llwarns << "Mesh loading returned empty volume." << llendl;
-			volume->makeTetrahedron();
 		}
 		
 		{ //update system volume
@@ -2440,6 +2448,7 @@ void LLMeshRepository::notifyMeshLoaded(const LLVolumeParams& mesh_params, LLVol
 			if (sys_volume)
 			{
 				sys_volume->copyVolumeFaces(volume);
+				sys_volume->setMeshAssetLoaded(TRUE);
 				LLPrimitive::getVolumeManager()->unrefVolume(sys_volume);
 			}
 			else
@@ -2496,7 +2505,7 @@ S32 LLMeshRepository::getActualMeshLOD(const LLVolumeParams& mesh_params, S32 lo
 	return mThread->getActualMeshLOD(mesh_params, lod);
 }
 
-const LLMeshSkinInfo* LLMeshRepository::getSkinInfo(const LLUUID& mesh_id, LLVOVolume* requesting_obj)
+const LLMeshSkinInfo* LLMeshRepository::getSkinInfo(const LLUUID& mesh_id, const LLVOVolume* requesting_obj)
 {
 	if (mesh_id.notNull())
 	{
@@ -2752,7 +2761,7 @@ void LLMeshRepository::uploadError(LLSD& args)
 }
 
 //static
-F32 LLMeshRepository::getStreamingCost(LLSD& header, F32 radius, S32* bytes, S32* bytes_visible, S32 lod)
+F32 LLMeshRepository::getStreamingCost(LLSD& header, F32 radius, S32* bytes, S32* bytes_visible, S32 lod, F32 *unscaled_value)
 {
 	F32 max_distance = 512.f;
 
@@ -2841,6 +2850,11 @@ F32 LLMeshRepository::getStreamingCost(LLSD& header, F32 radius, S32* bytes, S32
 					   triangles_low*low_area +
 					  triangles_lowest*lowest_area;
 
+	if (unscaled_value)
+	{
+		*unscaled_value = weighted_avg;
+	}
+
 	return weighted_avg/gSavedSettings.getU32("MeshTriangleBudget")*15000.f;
 }
 
@@ -3135,32 +3149,33 @@ void LLPhysicsDecomp::doDecompositionSingleHull()
 		llwarns << "Could not execute decomposition stage when attempting to create single hull." << llendl;
 		make_box(mCurRequest);
 	}
+	else
+	{
+		mMutex->lock();
+		mCurRequest->mHull.clear();
+		mCurRequest->mHull.resize(1);
+		mCurRequest->mHullMesh.clear();
+		mMutex->unlock();
 
-	mMutex->lock();
-	mCurRequest->mHull.clear();
-	mCurRequest->mHull.resize(1);
-	mCurRequest->mHullMesh.clear();
-	mMutex->unlock();
-
-	std::vector<LLVector3> p;
-	LLCDHull hull;
+		std::vector<LLVector3> p;
+		LLCDHull hull;
 		
-	// if LLConvexDecomposition is a stub, num_hulls should have been set to 0 above, and we should not reach this code
-	decomp->getSingleHull(&hull);
+		// if LLConvexDecomposition is a stub, num_hulls should have been set to 0 above, and we should not reach this code
+		decomp->getSingleHull(&hull);
 
-	const F32* v = hull.mVertexBase;
+		const F32* v = hull.mVertexBase;
 
-	for (S32 j = 0; j < hull.mNumVertices; ++j)
-	{
-		LLVector3 vert(v[0], v[1], v[2]); 
-		p.push_back(vert);
-		v = (F32*) (((U8*) v) + hull.mVertexStrideBytes);
-	}
+		for (S32 j = 0; j < hull.mNumVertices; ++j)
+		{
+			LLVector3 vert(v[0], v[1], v[2]); 
+			p.push_back(vert);
+			v = (F32*) (((U8*) v) + hull.mVertexStrideBytes);
+		}
 						
-	mMutex->lock();
-	mCurRequest->mHull[0] = p;
-	mMutex->unlock();	
-			
+		mMutex->lock();
+		mCurRequest->mHull[0] = p;
+		mMutex->unlock();	
+	}		
 #else
 	setMeshData(mesh, false);
 
@@ -3498,8 +3513,7 @@ void LLMeshRepository::buildPhysicsMesh(LLModel::Decomposition& decomp)
 bool LLMeshRepository::meshUploadEnabled()
 {
 	LLViewerRegion *region = gAgent.getRegion();
-	if(gSavedSettings.getBOOL("MeshEnabled") && 
-	   LLViewerParcelMgr::getInstance()->allowAgentBuild() &&
+	if(gSavedSettings.getBOOL("MeshEnabled") &&
 	   region)
 	{
 		return region->meshUploadEnabled();
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h
index 35a7314cd5..31b84ea0d9 100644
--- a/indra/newview/llmeshrepository.h
+++ b/indra/newview/llmeshrepository.h
@@ -445,7 +445,7 @@ public:
 	static U32 sCacheBytesWritten;
 	static U32 sPeakKbps;
 	
-	static F32 getStreamingCost(LLSD& header, F32 radius, S32* bytes = NULL, S32* visible_bytes = NULL, S32 detail = -1);
+	static F32 getStreamingCost(LLSD& header, F32 radius, S32* bytes = NULL, S32* visible_bytes = NULL, S32 detail = -1, F32 *unscaled_value = NULL);
 
 	LLMeshRepository();
 
@@ -464,7 +464,7 @@ public:
 
 	S32 getActualMeshLOD(const LLVolumeParams& mesh_params, S32 lod);
 	static S32 getActualMeshLOD(LLSD& header, S32 lod);
-	const LLMeshSkinInfo* getSkinInfo(const LLUUID& mesh_id, LLVOVolume* requesting_obj);
+	const LLMeshSkinInfo* getSkinInfo(const LLUUID& mesh_id, const LLVOVolume* requesting_obj);
 	LLModel::Decomposition* getDecomposition(const LLUUID& mesh_id);
 	void fetchPhysicsShape(const LLUUID& mesh_id);
 	bool hasPhysicsShape(const LLUUID& mesh_id);
diff --git a/indra/newview/llpanelmarketplaceinboxinventory.cpp b/indra/newview/llpanelmarketplaceinboxinventory.cpp
index faba6dc0cf..2e4bf55d51 100644
--- a/indra/newview/llpanelmarketplaceinboxinventory.cpp
+++ b/indra/newview/llpanelmarketplaceinboxinventory.cpp
@@ -196,15 +196,12 @@ void LLInboxFolderViewFolder::computeFreshness()
 
 	if (last_expansion_utc > 0)
 	{
-		const U32 time_offset_for_pdt = 7 * 60 * 60;
-		const U32 last_expansion = last_expansion_utc - time_offset_for_pdt;
-
-		mFresh = (mCreationDate > last_expansion);
+		mFresh = (mCreationDate > last_expansion_utc);
 
 #if DEBUGGING_FRESHNESS
 		if (mFresh)
 		{
-			llinfos << "Item is fresh! -- creation " << mCreationDate << ", saved_freshness_date " << last_expansion << llendl;
+			llinfos << "Item is fresh! -- creation " << mCreationDate << ", saved_freshness_date " << last_expansion_utc << llendl;
 		}
 #endif
 	}
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index c222bbb191..1f77e7a602 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -1112,7 +1112,16 @@ void LLPanelObject::getState( )
 			
 			if (mCtrlSculptType)
 			{
-				mCtrlSculptType->setCurrentByIndex(sculpt_stitching);
+				if (sculpt_stitching == LL_SCULPT_TYPE_NONE)
+				{
+					// since 'None' is no longer an option in the combo box
+					// use 'Plane' as an equivalent sculpt type
+					mCtrlSculptType->setSelectedByValue(LLSD(LL_SCULPT_TYPE_PLANE), true);
+				}
+				else
+				{
+					mCtrlSculptType->setSelectedByValue(LLSD(sculpt_stitching), true);
+				}
 				mCtrlSculptType->setEnabled(editable && !isMesh);
 			}
 
@@ -1749,7 +1758,7 @@ void LLPanelObject::sendSculpt()
 	U8 sculpt_type = 0;
 	
 	if (mCtrlSculptType)
-		sculpt_type |= mCtrlSculptType->getCurrentIndex();
+		sculpt_type |= mCtrlSculptType->getValue().asInteger();
 
 	bool enabled = sculpt_type != LL_SCULPT_TYPE_MESH;
 
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
index bb87601d20..12eea7844d 100644
--- a/indra/newview/llpanelvolume.cpp
+++ b/indra/newview/llpanelvolume.cpp
@@ -351,7 +351,7 @@ void LLPanelVolume::getState( )
 	getChild<LLUICtrl>("Flexible1D Checkbox Ctrl")->setValue(is_flexible);
 	if (is_flexible || (volobjp && volobjp->canBeFlexible()))
 	{
-		getChildView("Flexible1D Checkbox Ctrl")->setEnabled(editable && single_volume && volobjp);
+		getChildView("Flexible1D Checkbox Ctrl")->setEnabled(editable && single_volume && volobjp && !volobjp->isMesh());
 	}
 	else
 	{
diff --git a/indra/newview/llsecapi.h b/indra/newview/llsecapi.h
index 0935a0005b..db57848320 100644
--- a/indra/newview/llsecapi.h
+++ b/indra/newview/llsecapi.h
@@ -132,7 +132,7 @@ protected:
 // LLCertificates are considered unmodifiable
 // Certificates are pulled out of stores, or created via
 // factory calls
-class LLCertificate : public LLRefCount
+class LLCertificate : public LLThreadSafeRefCount
 {
 	LOG_CLASS(LLCertificate);
 public:
@@ -170,7 +170,7 @@ public:
 	
 	// base iterator implementation class, providing
 	// the functionality needed for the iterator class.
-	class iterator_impl : public LLRefCount
+	class iterator_impl : public LLThreadSafeRefCount
 	{
 	public:
 		iterator_impl() {};
@@ -289,7 +289,7 @@ bool operator!=(const LLCertificateVector::iterator& _lhs, const LLCertificateVe
 // * Persistence of credential information based on grid (for saving username/password)
 // * Serialization to an OGP identifier/authenticator pair
 // 
-class LLCredential  : public LLRefCount
+class LLCredential  : public LLThreadSafeRefCount
 {
 public:
 	
@@ -424,7 +424,7 @@ protected:
 
 // LLSecAPIHandler Class
 // Interface handler class for the various security storage handlers.
-class LLSecAPIHandler : public LLRefCount
+class LLSecAPIHandler : public LLThreadSafeRefCount
 {
 public:
 	
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 26b2b0f5c3..733902ad30 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -6520,32 +6520,75 @@ U32 LLObjectSelection::getSelectedObjectTriangleCount()
 	return count;
 }
 
-/*S32 LLObjectSelection::getSelectedObjectRenderCost()
+S32 LLObjectSelection::getSelectedObjectRenderCost()
 {
        S32 cost = 0;
        LLVOVolume::texture_cost_t textures;
+       typedef std::set<LLUUID> uuid_list_t;
+       uuid_list_t computed_objects;
+
+	   typedef std::list<LLPointer<LLViewerObject> > child_list_t;
+	   typedef const child_list_t const_child_list_t;
+
+	   // add render cost of complete linksets first, to get accurate texture counts
        for (list_t::iterator iter = mList.begin(); iter != mList.end(); ++iter)
        {
                LLSelectNode* node = *iter;
+			   
                LLVOVolume* object = (LLVOVolume*)node->getObject();
 
-               if (object)
-               {
-                       cost += object->getRenderCost(textures);
-               }
-
-               for (LLVOVolume::texture_cost_t::iterator iter = textures.begin(); iter != textures.end(); ++iter)
+               if (object && object->isRootEdit())
                {
-                       // add the cost of each individual texture in the linkset
-                       cost += iter->second;
+				   cost += object->getRenderCost(textures);
+				   computed_objects.insert(object->getID());
+
+				   const_child_list_t children = object->getChildren();
+				   for (const_child_list_t::const_iterator child_iter = children.begin();
+						 child_iter != children.end();
+						 ++child_iter)
+				   {
+					   LLViewerObject* child_obj = *child_iter;
+					   LLVOVolume *child = dynamic_cast<LLVOVolume*>( child_obj );
+					   if (child)
+					   {
+						   cost += child->getRenderCost(textures);
+						   computed_objects.insert(child->getID());
+					   }
+				   }
+
+				   for (LLVOVolume::texture_cost_t::iterator iter = textures.begin(); iter != textures.end(); ++iter)
+				   {
+					   // add the cost of each individual texture in the linkset
+					   cost += iter->second;
+				   }
+
+				   textures.clear();
                }
-               textures.clear();
        }
+	
+	   // add any partial linkset objects, texture cost may be slightly misleading
+		for (list_t::iterator iter = mList.begin(); iter != mList.end(); ++iter)
+		{
+			LLSelectNode* node = *iter;
+			LLVOVolume* object = (LLVOVolume*)node->getObject();
+
+			if (object && computed_objects.find(object->getID()) == computed_objects.end()  )
+			{
+					cost += object->getRenderCost(textures);
+					computed_objects.insert(object->getID());
+			}
 
+			for (LLVOVolume::texture_cost_t::iterator iter = textures.begin(); iter != textures.end(); ++iter)
+			{
+				// add the cost of each individual texture in the linkset
+				cost += iter->second;
+			}
 
-       return cost;
-}*/
+			textures.clear();
+		}
 
+       return cost;
+}
 
 //-----------------------------------------------------------------------------
 // getTECount()
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index fd17781a2e..6c2b71dd0a 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -2763,6 +2763,115 @@ void renderUpdateType(LLDrawable* drawablep)
 	}
 }
 
+void renderComplexityDisplay(LLDrawable* drawablep)
+{
+	LLViewerObject* vobj = drawablep->getVObj();
+	if (!vobj)
+	{
+		return;
+	}
+
+	LLVOVolume *voVol = dynamic_cast<LLVOVolume*>(vobj);
+
+	if (!voVol)
+	{
+		return;
+	}
+
+	if (!voVol->isRoot())
+	{
+		return;
+	}
+
+	LLVOVolume::texture_cost_t textures;
+	F32 cost = (F32) voVol->getRenderCost(textures);
+
+	// add any child volumes
+	LLViewerObject::const_child_list_t children = voVol->getChildren();
+	for (LLViewerObject::const_child_list_t::const_iterator iter = children.begin(); iter != children.end(); ++iter)
+	{
+		const LLViewerObject *child = *iter;
+		const LLVOVolume *child_volume = dynamic_cast<const LLVOVolume*>(child);
+		if (child_volume)
+		{
+			cost += child_volume->getRenderCost(textures);
+		}
+	}
+
+	// add texture cost
+	for (LLVOVolume::texture_cost_t::iterator iter = textures.begin(); iter != textures.end(); ++iter)
+	{
+		// add the cost of each individual texture in the linkset
+		cost += iter->second;
+	}
+
+	F32 cost_max = (F32) LLVOVolume::getRenderComplexityMax();
+
+
+
+	// allow user to set a static color scale
+	if (gSavedSettings.getS32("RenderComplexityStaticMax") > 0)
+	{
+		cost_max = gSavedSettings.getS32("RenderComplexityStaticMax");
+	}
+
+	F32 cost_ratio = cost / cost_max;
+	
+	// cap cost ratio at 1.0f in case cost_max is at a low threshold
+	cost_ratio = cost_ratio > 1.0f ? 1.0f : cost_ratio;
+	
+	LLGLEnable blend(GL_BLEND);
+
+	LLColor4 color;
+	const LLColor4 color_min = gSavedSettings.getColor4("RenderComplexityColorMin");
+	const LLColor4 color_mid = gSavedSettings.getColor4("RenderComplexityColorMid");
+	const LLColor4 color_max = gSavedSettings.getColor4("RenderComplexityColorMax");
+
+	if (cost_ratio < 0.5f)
+	{
+		color = color_min * (1 - cost_ratio * 2) + color_mid * (cost_ratio * 2);
+	}
+	else
+	{
+		color = color_mid * (1 - (cost_ratio - 0.5) * 2) + color_max * ((cost_ratio - 0.5) * 2);
+	}
+
+	LLSD color_val = color.getValue();
+
+	// don't highlight objects below the threshold
+	if (cost > gSavedSettings.getS32("RenderComplexityThreshold"))
+	{
+		glColor4f(color[0],color[1],color[2],0.5f);
+
+
+		S32 num_faces = drawablep->getNumFaces();
+		if (num_faces)
+		{
+			for (S32 i = 0; i < num_faces; ++i)
+			{
+				pushVerts(drawablep->getFace(i), LLVertexBuffer::MAP_VERTEX);
+			}
+		}
+		LLViewerObject::const_child_list_t children = voVol->getChildren();
+		for (LLViewerObject::const_child_list_t::const_iterator iter = children.begin(); iter != children.end(); ++iter)
+		{
+			const LLViewerObject *child = *iter;
+			if (child)
+			{
+				num_faces = child->getNumFaces();
+				if (num_faces)
+				{
+					for (S32 i = 0; i < num_faces; ++i)
+					{
+						pushVerts(child->mDrawable->getFace(i), LLVertexBuffer::MAP_VERTEX);
+					}
+				}
+			}
+		}
+	}
+	
+	voVol->setDebugText(llformat("%4.0f", cost));	
+}
 
 void renderBoundingBox(LLDrawable* drawable, BOOL set_color = TRUE)
 {
@@ -3867,6 +3976,10 @@ public:
 			{
 				renderUpdateType(drawable);
 			}
+			if(gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_RENDER_COMPLEXITY))
+			{
+				renderComplexityDisplay(drawable);
+			}
 
 			LLVOAvatar* avatar = dynamic_cast<LLVOAvatar*>(drawable->getVObj().get());
 			
@@ -4115,7 +4228,8 @@ void LLSpatialPartition::renderDebug()
 									  LLPipeline::RENDER_DEBUG_AVATAR_VOLUME |
 									  LLPipeline::RENDER_DEBUG_AGENT_TARGET |
 									  //LLPipeline::RENDER_DEBUG_BUILD_QUEUE |
-									  LLPipeline::RENDER_DEBUG_SHADOW_FRUSTA)) 
+									  LLPipeline::RENDER_DEBUG_SHADOW_FRUSTA |
+									  LLPipeline::RENDER_DEBUG_RENDER_COMPLEXITY)) 
 	{
 		return;
 	}
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index c38c8bad80..b0d9bd5d70 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -35,7 +35,6 @@
 #include "llagent.h"
 #include "llagentcamera.h"
 #include "llavatarnamecache.h"
-#include "llviewercontrol.h"
 #include "llfocusmgr.h"
 #include "llfirstuse.h"
 #include "llfloaterland.h"
@@ -57,6 +56,7 @@
 #include "lltrans.h"
 #include "llviewercamera.h"
 #include "llviewerparcelmedia.h"
+#include "llviewercontrol.h"
 #include "llviewermenu.h"
 #include "llviewerobjectlist.h"
 #include "llviewerobject.h"
@@ -76,7 +76,6 @@ static void handle_click_action_play();
 static void handle_click_action_open_media(LLPointer<LLViewerObject> objectp);
 static ECursorType cursor_from_parcel_media(U8 click_action);
 
-
 LLToolPie::LLToolPie()
 :	LLTool(std::string("Pie")),
 	mMouseButtonDown( false ),
@@ -479,6 +478,18 @@ void LLToolPie::resetSelection()
 	mClickAction = 0;
 }
 
+void LLToolPie::walkToClickedLocation()
+{
+	if(mAutoPilotDestination) { mAutoPilotDestination->markDead(); }
+	mAutoPilotDestination = (LLHUDEffectBlob *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BLOB, FALSE);
+	mAutoPilotDestination->setPositionGlobal(mPick.mPosGlobal);
+	mAutoPilotDestination->setPixelSize(5);
+	mAutoPilotDestination->setColor(LLColor4U(170, 210, 190));
+	mAutoPilotDestination->setDuration(3.f);
+
+	handle_go_to();
+}
+
 // When we get object properties after left-clicking on an object
 // with left-click = buy, if it's the same object, do the buy.
 
@@ -662,18 +673,9 @@ BOOL LLToolPie::handleMouseUp(S32 x, S32 y, MASK mask)
 			mPick.mPosGlobal = gAgent.getPositionGlobal() + LLVector3d(LLViewerCamera::instance().getAtAxis()) * SELF_CLICK_WALK_DISTANCE;
 		}
 		gAgentCamera.setFocusOnAvatar(TRUE, TRUE);
-		if(mAutoPilotDestination) { mAutoPilotDestination->markDead(); }
-		mAutoPilotDestination = (LLHUDEffectBlob *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BLOB, FALSE);
-		mAutoPilotDestination->setPositionGlobal(mPick.mPosGlobal);
-		mAutoPilotDestination->setPixelSize(5);
-		mAutoPilotDestination->setColor(LLColor4U(170, 210, 190));
-		mAutoPilotDestination->setDuration(3.f);
-
-		handle_go_to();
+		walkToClickedLocation();
 		LLFirstUse::notMoving(false);
 
-		mBlockClickToWalk = false;
-
 		return TRUE;
 	}
 	gViewerWindow->setCursor(UI_CURSOR_ARROW);
@@ -708,16 +710,10 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
 
 	if (gSavedSettings.getBOOL("DoubleClickAutoPilot"))
 	{
-		if (mPick.mPickType == LLPickInfo::PICK_LAND
-			&& !mPick.mPosGlobal.isExactlyZero())
-		{
-			handle_go_to();
-			return TRUE;
-		}
-		else if (mPick.mObjectID.notNull()
-				 && !mPick.mPosGlobal.isExactlyZero())
+		if ((mPick.mPickType == LLPickInfo::PICK_LAND && !mPick.mPosGlobal.isExactlyZero()) ||
+			(mPick.mObjectID.notNull()  && !mPick.mPosGlobal.isExactlyZero()))
 		{
-			handle_go_to();
+			walkToClickedLocation();
 			return TRUE;
 		}
 	}
diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h
index d7c79ee223..68fe8bc4a5 100644
--- a/indra/newview/lltoolpie.h
+++ b/indra/newview/lltoolpie.h
@@ -66,6 +66,7 @@ public:
 	LLViewerObject*		getClickActionObject() { return mClickActionObject; }
 	LLObjectSelection*	getLeftClickSelection() { return (LLObjectSelection*)mLeftClickSelection; }
 	void 				resetSelection();
+	void				walkToClickedLocation();
 	void				blockClickToWalk() { mBlockClickToWalk = true; }
 	void				stopClickToWalk();
 	
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index cd522c9121..967e26be0c 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -142,7 +142,6 @@ static bool handleRenderPerfTestChanged(const LLSD& newvalue)
                                                                          LLPipeline::RENDER_TYPE_WATER,
                                                                          LLPipeline::RENDER_TYPE_PASS_GRASS,
                                                                          LLPipeline::RENDER_TYPE_HUD,
-                                                                         LLPipeline::RENDER_TYPE_PARTICLES,
                                                                          LLPipeline::RENDER_TYPE_CLOUDS,
                                                                          LLPipeline::RENDER_TYPE_HUD_PARTICLES,
                                                                          LLPipeline::END_RENDER_TYPES); 
@@ -158,7 +157,6 @@ static bool handleRenderPerfTestChanged(const LLSD& newvalue)
                                                                          LLPipeline::RENDER_TYPE_WATER,
                                                                          LLPipeline::RENDER_TYPE_PASS_GRASS,
                                                                          LLPipeline::RENDER_TYPE_HUD,
-                                                                         LLPipeline::RENDER_TYPE_PARTICLES,
                                                                          LLPipeline::RENDER_TYPE_CLOUDS,
                                                                          LLPipeline::RENDER_TYPE_HUD_PARTICLES,
                                                                          LLPipeline::END_RENDER_TYPES);
@@ -168,6 +166,11 @@ static bool handleRenderPerfTestChanged(const LLSD& newvalue)
        return true;
 }
 
+bool handleRenderAvatarComplexityLimitChanged(const LLSD& newvalue)
+{
+	return true;
+}
+
 bool handleRenderTransparentWaterChanged(const LLSD& newvalue)
 {
 	LLWorld::getInstance()->updateWaterObjects();
@@ -404,7 +407,7 @@ static bool handleRenderDeferredChanged(const LLSD& newvalue)
 		gPipeline.releaseGLBuffers();
 		gPipeline.createGLBuffers();
 		gPipeline.resetVertexBuffers();
-		if (LLPipeline::sRenderDeferred && LLRenderTarget::sUseFBO)
+		if (LLPipeline::sRenderDeferred == (BOOL)LLRenderTarget::sUseFBO)
 		{
 			LLViewerShaderMgr::instance()->setShaders();
 		}
@@ -605,6 +608,7 @@ void settings_setup_listeners()
 	gSavedSettings.getControl("WindLightUseAtmosShaders")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
 	gSavedSettings.getControl("RenderGammaFull")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
 	gSavedSettings.getControl("RenderAvatarMaxVisible")->getSignal()->connect(boost::bind(&handleAvatarMaxVisibleChanged, _2));
+	gSavedSettings.getControl("RenderAvatarComplexityLimit")->getSignal()->connect(boost::bind(&handleRenderAvatarComplexityLimitChanged, _2));
 	gSavedSettings.getControl("RenderVolumeLODFactor")->getSignal()->connect(boost::bind(&handleVolumeLODChanged, _2));
 	gSavedSettings.getControl("RenderAvatarLODFactor")->getSignal()->connect(boost::bind(&handleAvatarLODChanged, _2));
 	gSavedSettings.getControl("RenderAvatarPhysicsLODFactor")->getSignal()->connect(boost::bind(&handleAvatarPhysicsLODChanged, _2));
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 6142ee0dd6..19326c4e30 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -202,7 +202,7 @@ void display_stats()
 		gMemoryAllocated = LLMemory::getCurrentRSS();
 		U32 memory = (U32)(gMemoryAllocated / (1024*1024));
 		llinfos << llformat("MEMORY: %d MB", memory) << llendl;
-		LLMemory::logMemoryInfo() ;
+		LLMemory::logMemoryInfo(TRUE) ;
 		gRecentMemoryTime.reset();
 	}
 }
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 174a4d6409..5017fdcf92 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -80,6 +80,7 @@
 #include "llfloatermodelwizard.h"
 #include "llfloaternamedesc.h"
 #include "llfloaternotificationsconsole.h"
+#include "llfloaterobjectweights.h"
 #include "llfloateropenobject.h"
 #include "llfloaterpay.h"
 #include "llfloaterperms.h"
@@ -233,6 +234,7 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("notifications_console", "floater_notifications_console.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterNotificationConsole>);
 	LLFloaterReg::add("notification_well_window", "floater_sys_well.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLNotificationWellWindow>);
 
+	LLFloaterReg::add("object_weights", "floater_object_weights.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterObjectWeights>);
 	LLFloaterReg::add("openobject", "floater_openobject.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterOpenObject>);
 	LLFloaterReg::add("outgoing_call", "floater_outgoing_call.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLOutgoingCallDialog>);
 	LLFloaterPayUtil::registerFloater();
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index f8ef81b9f4..aa54633099 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -142,7 +142,7 @@ public:
 		mInventoryItemsDict["Female - Wow"]				= LLTrans::getString("Female - Wow");
 
 		//common
-		mInventoryItemsDict["/bow1"]					= LLTrans::getString("/bow1");
+		mInventoryItemsDict["/bow"]						= LLTrans::getString("/bow");
 		mInventoryItemsDict["/clap"]					= LLTrans::getString("/clap");
 		mInventoryItemsDict["/count"]					= LLTrans::getString("/count");
 		mInventoryItemsDict["/extinguish"]				= LLTrans::getString("/extinguish");
diff --git a/indra/newview/llviewerjoystick.cpp b/indra/newview/llviewerjoystick.cpp
index fbf11f20db..f6e840adcd 100644
--- a/indra/newview/llviewerjoystick.cpp
+++ b/indra/newview/llviewerjoystick.cpp
@@ -51,9 +51,6 @@
 #define RY_I	5
 #define RZ_I	3
 
-// minimum time after setting away state before coming back
-const F32 MIN_AFK_TIME = 2.f;
-
 F32  LLViewerJoystick::sLastDelta[] = {0,0,0,0,0,0,0};
 F32  LLViewerJoystick::sDelta[] = {0,0,0,0,0,0,0};
 
@@ -551,7 +548,7 @@ void LLViewerJoystick::moveObjects(bool reset)
 	if (!is_zero)
 	{
 		// Clear AFK state if moved beyond the deadzone
-		if (gAwayTimer.getElapsedTimeF32() > MIN_AFK_TIME)
+		if (gAwayTimer.getElapsedTimeF32() > LLAgent::MIN_AFK_TIME)
 		{
 			gAgent.clearAFK();
 		}
@@ -725,7 +722,7 @@ void LLViewerJoystick::moveAvatar(bool reset)
 	if (!is_zero)
 	{
 		// Clear AFK state if moved beyond the deadzone
-		if (gAwayTimer.getElapsedTimeF32() > MIN_AFK_TIME)
+		if (gAwayTimer.getElapsedTimeF32() > LLAgent::MIN_AFK_TIME)
 		{
 			gAgent.clearAFK();
 		}
@@ -941,7 +938,7 @@ void LLViewerJoystick::moveFlycam(bool reset)
 	}
 	
 	// Clear AFK state if moved beyond the deadzone
-	if (!is_zero && gAwayTimer.getElapsedTimeF32() > MIN_AFK_TIME)
+	if (!is_zero && gAwayTimer.getElapsedTimeF32() > LLAgent::MIN_AFK_TIME)
 	{
 		gAgent.clearAFK();
 	}
@@ -1001,7 +998,7 @@ bool LLViewerJoystick::toggleFlycam()
 		gAgentCamera.changeCameraToDefault();
 	}
 
-	if (gAwayTimer.getElapsedTimeF32() > MIN_AFK_TIME)
+	if (gAwayTimer.getElapsedTimeF32() > LLAgent::MIN_AFK_TIME)
 	{
 		gAgent.clearAFK();
 	}
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index cd71b6d42a..d81e67bfe2 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -100,7 +100,6 @@
 #include "lltrans.h"
 #include "llsdutil.h"
 #include "llmediaentry.h"
-#include "llaccountingquota.h"
 
 //#define DEBUG_UPDATE_TYPE
 
@@ -140,6 +139,7 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco
 			if (!gAgentAvatarp)
 			{
 				gAgentAvatarp = new LLVOAvatarSelf(id, pcode, regionp);
+				gAgentAvatarp->initInstance();
 			}
 			else 
 			{
@@ -149,9 +149,10 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco
 		}
 		else
 		{
-			res = new LLVOAvatar(id, pcode, regionp); 
+			LLVOAvatar *avatar = new LLVOAvatar(id, pcode, regionp); 
+			avatar->initInstance();
+			res = avatar;
 		}
-		static_cast<LLVOAvatar*>(res)->initInstance();
 		break;
 	}
 	case LL_PCODE_LEGACY_GRASS:
@@ -628,6 +629,20 @@ void LLViewerObject::constructAndAddReturnable( std::vector<PotentialReturnableO
 	}
 }
 
+bool LLViewerObject::crossesParcelBounds()
+{
+	std::vector<LLBBox> boxes;
+	boxes.push_back(LLBBox(getPositionRegion(), getRotationRegion(), getScale() * -0.5f, getScale() * 0.5f).getAxisAligned());
+	for (child_list_t::iterator iter = mChildList.begin();
+		 iter != mChildList.end(); iter++)
+	{
+		LLViewerObject* child = *iter;
+		boxes.push_back(LLBBox(child->getPositionRegion(), child->getRotationRegion(), child->getScale() * -0.5f, child->getScale() * 0.5f).getAxisAligned());
+	}
+
+	return mRegionp && mRegionp->objectsCrossParcel(boxes);
+}
+
 BOOL LLViewerObject::setParent(LLViewerObject* parent)
 {
 	if(mParent != parent)
@@ -5785,9 +5800,3 @@ public:
 LLHTTPRegistration<ObjectPhysicsProperties>
 	gHTTPRegistrationObjectPhysicsProperties("/message/ObjectPhysicsProperties");
 
-
-void LLViewerObject::updateQuota( const SelectionQuota& quota )
-{
-	//update quotas
-	mSelectionQuota = quota;
-}
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 1828a64917..53e951e483 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -43,7 +43,7 @@
 #include "v3dmath.h"
 #include "v3math.h"
 #include "llvertexbuffer.h"
-#include "llaccountingquota.h"
+#include "llbbox.h"
 #include "llbbox.h"
 
 class LLAgent;			// TODO: Get rid of this.
@@ -243,6 +243,10 @@ public:
 	void buildReturnablesForChildrenVO( std::vector<PotentialReturnableObject>& returnables, LLViewerObject* pChild, LLViewerRegion* pTargetRegion );
 	void constructAndAddReturnable( std::vector<PotentialReturnableObject>& returnables, LLViewerObject* pChild, LLViewerRegion* pTargetRegion );
 
+	// This method returns true if the object crosses
+	// any parcel bounds in the region.
+	bool crossesParcelBounds();
+
 	/*
 	// This method will scan through this object, and then query the
 	// selection manager to see if the local agent probably has the
@@ -655,9 +659,7 @@ protected:
 	void setParticleSource(const LLPartSysData& particle_parameters, const LLUUID& owner_id);
 	
 public:
-	void  updateQuota(  const SelectionQuota& quota );
-	const SelectionQuota& getQuota( void ) { return mSelectionQuota; }
-	
+		
 private:
 	void setNameValueList(const std::string& list);		// clears nv pairs and then individually adds \n separated NV pairs from \0 terminated string
 	void deleteTEImages(); // correctly deletes list of images
@@ -719,8 +721,6 @@ protected:
 	F32 mPhysicsCost;
 	F32 mLinksetPhysicsCost;
 
-	SelectionQuota mSelectionQuota;
-	
 	bool mCostStale;
 	mutable bool mPhysicsShapeUnknown;
 
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 153a91e7d8..6912faa9ec 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -58,6 +58,7 @@
 #include "llviewerregion.h"
 #include "llviewerstats.h"
 #include "llviewerstatsrecorder.h"
+#include "llvovolume.h"
 #include "llvoavatarself.h"
 #include "lltoolmgr.h"
 #include "lltoolpie.h"
@@ -993,6 +994,9 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world)
 	mNumSizeCulled = 0;
 	mNumVisCulled = 0;
 
+	// update max computed render cost
+	LLVOVolume::updateRenderComplexity();
+
 	// compute all sorts of time-based stats
 	// don't factor frames that were paused into the stats
 	if (! mWasPaused)
@@ -1443,15 +1447,6 @@ void LLViewerObjectList::onObjectCostFetchFailure(const LLUUID& object_id)
 	mPendingObjectCost.erase(object_id);
 }
 
-void LLViewerObjectList::updateQuota( const LLUUID& objectId, const SelectionQuota& quota  )
-{
-	LLViewerObject* pVO = findObject( objectId );
-	if ( pVO )
-	{
-		pVO->updateQuota( quota );
-	}
-}
-
 void LLViewerObjectList::updatePhysicsFlags(const LLViewerObject* object)
 {
 	mStalePhysicsFlags.insert(object->getID());
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h
index 9d1b5cb56f..c5f2a2c1ee 100644
--- a/indra/newview/llviewerobjectlist.h
+++ b/indra/newview/llviewerobjectlist.h
@@ -36,7 +36,6 @@
 
 // project includes
 #include "llviewerobject.h"
-#include "llaccountingquota.h"
 
 class LLCamera;
 class LLNetMap;
@@ -102,8 +101,6 @@ public:
 									F32 restitution,
 									F32 gravity_multiplier);
 
-	void updateQuota( const LLUUID& objectId, const SelectionQuota& costs );
-	
 	void shiftObjects(const LLVector3 &offset);
 	void repartitionObjects();
 
diff --git a/indra/newview/llviewerparceloverlay.cpp b/indra/newview/llviewerparceloverlay.cpp
index eff16b6a6e..e619b89f9b 100644
--- a/indra/newview/llviewerparceloverlay.cpp
+++ b/indra/newview/llviewerparceloverlay.cpp
@@ -201,6 +201,65 @@ bool LLViewerParcelOverlay::encroachesOnUnowned(const std::vector<LLBBox>& boxes
 	return false;
 }
 
+bool LLViewerParcelOverlay::encroachesOnNearbyParcel(const std::vector<LLBBox>& boxes) const
+{
+	// boxes are expected to already be axis aligned
+	for (U32 i = 0; i < boxes.size(); ++i)
+	{
+		LLVector3 min = boxes[i].getMinAgent();
+		LLVector3 max = boxes[i].getMaxAgent();
+
+		// If an object crosses region borders it crosses a parcel
+		if (   min.mV[VX] < 0
+			|| min.mV[VY] < 0
+			|| max.mV[VX] > REGION_WIDTH_METERS
+			|| max.mV[VY] > REGION_WIDTH_METERS)
+		{
+			return true;
+		}
+
+		S32 left   = S32(llclamp((min.mV[VX] / PARCEL_GRID_STEP_METERS), 0.f, REGION_WIDTH_METERS - 1));
+		S32 right  = S32(llclamp((max.mV[VX] / PARCEL_GRID_STEP_METERS), 0.f, REGION_WIDTH_METERS - 1));
+		S32 bottom = S32(llclamp((min.mV[VY] / PARCEL_GRID_STEP_METERS), 0.f, REGION_WIDTH_METERS - 1));
+		S32 top    = S32(llclamp((max.mV[VY] / PARCEL_GRID_STEP_METERS), 0.f, REGION_WIDTH_METERS - 1));
+
+		const S32 GRIDS_PER_EDGE = mParcelGridsPerEdge;
+
+		for (S32 row = bottom; row <= top; row++)
+		{
+			for (S32 col = left; col <= right; col++)
+			{
+				// This is not the rightmost column
+				if (col < GRIDS_PER_EDGE-1)
+				{
+					U8 east_overlay = mOwnership[row*GRIDS_PER_EDGE+col+1];
+					// If the column to the east of the current one marks
+					// the other parcel's west edge and the box extends
+					// to the west it crosses the parcel border.
+					if ((east_overlay & PARCEL_WEST_LINE) && col < right)
+					{
+						return true;
+					}
+				}
+
+				// This is not the topmost column
+				if (row < GRIDS_PER_EDGE-1)
+				{
+					U8 north_overlay = mOwnership[(row+1)*GRIDS_PER_EDGE+col];
+					// If the row to the north of the current one marks
+					// the other parcel's south edge and the box extends
+					// to the south it crosses the parcel border.
+					if ((north_overlay & PARCEL_SOUTH_LINE) && row < top)
+					{
+						return true;
+					}
+				}
+			}
+		}
+	}
+	return false;
+}
+
 BOOL LLViewerParcelOverlay::isSoundLocal(const LLVector3& pos) const
 {
 	S32 row =    S32(pos.mV[VY] / PARCEL_GRID_STEP_METERS);
diff --git a/indra/newview/llviewerparceloverlay.h b/indra/newview/llviewerparceloverlay.h
index 3c6794e7d0..7445d5bf1d 100644
--- a/indra/newview/llviewerparceloverlay.h
+++ b/indra/newview/llviewerparceloverlay.h
@@ -61,6 +61,7 @@ public:
 	// bounding boxes which isn't perfect, but is close
 	bool encroachesOwned(const std::vector<LLBBox>& boxes) const;
 	bool encroachesOnUnowned(const std::vector<LLBBox>& boxes) const;
+	bool encroachesOnNearbyParcel(const std::vector<LLBBox>& boxes) const;
 	
 	BOOL			isSoundLocal(const LLVector3& pos) const;
 
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 17f908d73f..ed943964f9 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1487,11 +1487,8 @@ void LLViewerRegion::unpackRegionHandshake()
 	msg->sendReliable(host);
 }
 
-	
 void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 {
-	capabilityNames.append("AccountingParcel");
-	capabilityNames.append("AccountingSelection");
 	capabilityNames.append("AttachmentResources");
 	capabilityNames.append("AvatarPickerSearch");
 	capabilityNames.append("ChatSessionRequest");
@@ -1531,6 +1528,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 	capabilityNames.append("ProvisionVoiceAccountRequest");
 	capabilityNames.append("RemoteParcelRequest");
 	capabilityNames.append("RequestTextureDownload");
+	capabilityNames.append("ResourceCostSelected");
 	capabilityNames.append("SearchStatRequest");
 	capabilityNames.append("SearchStatTracking");
 	capabilityNames.append("SendPostcard");
@@ -1556,10 +1554,6 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 	capabilityNames.append("ViewerMetrics");
 	capabilityNames.append("ViewerStartAuction");
 	capabilityNames.append("ViewerStats");
-	//prep# Finalize these!!!!!!!!!
-	//capabilityNames.append("AccountingVO");	
-	capabilityNames.append("AccountingParcel");
-	capabilityNames.append("AccountingRegion");
 	
 	// Please add new capabilities alphabetically to reduce
 	// merge conflicts.
@@ -1790,6 +1784,11 @@ bool LLViewerRegion::childrenObjectReturnable( const std::vector<LLBBox>& boxes
 	return result;
 }
 
+bool LLViewerRegion::objectsCrossParcel(const std::vector<LLBBox>& boxes) const
+{
+	return mParcelOverlay && mParcelOverlay->encroachesOnNearbyParcel(boxes);
+}
+
 void LLViewerRegion::getNeighboringRegions( std::vector<LLViewerRegion*>& uniqueRegions )
 {
 	mImpl->mLandp->getNeighboringRegions( uniqueRegions );
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index ef1a6d285c..c483c6ef52 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -322,6 +322,7 @@ public:
 
 	bool objectIsReturnable(const LLVector3& pos, const std::vector<LLBBox>& boxes) const;
 	bool childrenObjectReturnable( const std::vector<LLBBox>& boxes ) const;
+	bool objectsCrossParcel(const std::vector<LLBBox>& boxes) const;
 
 	void getNeighboringRegions( std::vector<LLViewerRegion*>& uniqueRegions );
 	
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 149f9893d7..a673555e31 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -240,8 +240,6 @@ BOOL				gDisplayBadge = FALSE;
 static const U8 NO_FACE = 255;
 BOOL gQuietSnapshot = FALSE;
 
-const F32 MIN_AFK_TIME = 2.f; // minimum time after setting away state before coming back
-
 static const F32 MIN_DISPLAY_SCALE = 0.75f;
 
 std::string	LLViewerWindow::sSnapshotBaseName;
@@ -1214,7 +1212,7 @@ void LLViewerWindow::handleMouseMove(LLWindow *window,  LLCoordGL pos, MASK mask
 
 	mWindow->showCursorFromMouseMove();
 
-	if (gAwayTimer.getElapsedTimeF32() > MIN_AFK_TIME)
+	if (gAwayTimer.getElapsedTimeF32() > LLAgent::MIN_AFK_TIME)
 	{
 		gAgent.clearAFK();
 	}
@@ -1302,7 +1300,7 @@ BOOL LLViewerWindow::handleTranslatedKeyDown(KEY key,  MASK mask, BOOL repeated)
 	// Let the voice chat code check for its PTT key.  Note that this never affects event processing.
 	LLVoiceClient::getInstance()->keyDown(key, mask);
 	
-	if (gAwayTimer.getElapsedTimeF32() > MIN_AFK_TIME)
+	if (gAwayTimer.getElapsedTimeF32() > LLAgent::MIN_AFK_TIME)
 	{
 		gAgent.clearAFK();
 	}
@@ -1352,6 +1350,7 @@ BOOL LLViewerWindow::handleActivate(LLWindow *window, BOOL activated)
 	{
 		mActive = FALSE;
 				
+		// if the user has chosen to go Away automatically after some time, then go Away when minimizing
 		if (gSavedSettings.getS32("AFKTimeout"))
 		{
 			gAgent.setAFK();
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 7c6a815def..e457cc3e70 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -2803,7 +2803,10 @@ void LLVOAvatar::idleUpdateLoadingEffect()
 																 LLPartData::LL_PART_EMISSIVE_MASK | // LLPartData::LL_PART_FOLLOW_SRC_MASK |
 																 LLPartData::LL_PART_TARGET_POS_MASK );
 			
-			setParticleSource(particle_parameters, getID());
+			if (!isTooComplex()) // do not generate particles for overly-complex avatars
+			{
+				setParticleSource(particle_parameters, getID());
+			}
 		}
 	}
 }	
@@ -6389,6 +6392,11 @@ BOOL LLVOAvatar::getIsCloud()
 	{
 		return TRUE;
 	}
+
+	if (isTooComplex())
+	{
+		return TRUE;
+	}
 	return FALSE;
 }
 
@@ -6483,6 +6491,16 @@ BOOL LLVOAvatar::isFullyLoaded() const
 		return mFullyLoaded;
 }
 
+bool LLVOAvatar::isTooComplex() const
+{
+	if (gSavedSettings.getS32("RenderAvatarComplexityLimit") > 0 && mVisualComplexity >= gSavedSettings.getS32("RenderAvatarComplexityLimit"))
+	{
+		return true;
+	}
+
+	return false;
+}
+
 
 //-----------------------------------------------------------------------------
 // findMotion()
@@ -8315,7 +8333,7 @@ void LLVOAvatar::getImpostorValues(LLVector4a* extents, LLVector3& angle, F32& d
 
 void LLVOAvatar::idleUpdateRenderCost()
 {
-	static const U32 ARC_BODY_PART_COST = 20;
+	static const U32 ARC_BODY_PART_COST = 200;
 	static const U32 ARC_LIMIT = 2048;
 
 	static std::set<LLUUID> all_textures;
@@ -8326,7 +8344,7 @@ void LLVOAvatar::idleUpdateRenderCost()
 	}
 
 	U32 cost = 0;
-	std::set<LLUUID> textures;
+	LLVOVolume::texture_cost_t textures;
 
 	for (U8 baked_index = 0; baked_index < BAKED_NUM_INDICES; baked_index++)
 	{
@@ -8341,6 +8359,7 @@ void LLVOAvatar::idleUpdateRenderCost()
 		}
 	}
 
+
 	for (attachment_map_t::const_iterator iter = mAttachmentPoints.begin(); 
 		 iter != mAttachmentPoints.end();
 		 ++iter)
@@ -8353,6 +8372,7 @@ void LLVOAvatar::idleUpdateRenderCost()
 			const LLViewerObject* attached_object = (*attachment_iter);
 			if (attached_object && !attached_object->isHUDAttachment())
 			{
+				textures.clear();
 				const LLDrawable* drawable = attached_object->mDrawable;
 				if (drawable)
 				{
@@ -8360,6 +8380,25 @@ void LLVOAvatar::idleUpdateRenderCost()
 					if (volume)
 					{
 						cost += volume->getRenderCost(textures);
+
+						const_child_list_t children = volume->getChildren();
+						for (const_child_list_t::const_iterator child_iter = children.begin();
+							  child_iter != children.end();
+							  ++child_iter)
+						{
+							LLViewerObject* child_obj = *child_iter;
+							LLVOVolume *child = dynamic_cast<LLVOVolume*>( child_obj );
+							if (child)
+							{
+								cost += child->getRenderCost(textures);
+							}
+						}
+
+						for (LLVOVolume::texture_cost_t::iterator iter = textures.begin(); iter != textures.end(); ++iter)
+						{
+							// add the cost of each individual texture in the linkset
+							cost += iter->second;
+						}
 					}
 				}
 			}
@@ -8367,15 +8406,17 @@ void LLVOAvatar::idleUpdateRenderCost()
 
 	}
 
+
+
 	// Diagnostic output to identify all avatar-related textures.
 	// Does not affect rendering cost calculation.
 	// Could be wrapped in a debug option if output becomes problematic.
 	if (isSelf())
 	{
 		// print any attachment textures we didn't already know about.
-		for (std::set<LLUUID>::iterator it = textures.begin(); it != textures.end(); ++it)
+		for (LLVOVolume::texture_cost_t::iterator it = textures.begin(); it != textures.end(); ++it)
 		{
-			LLUUID image_id = *it;
+			LLUUID image_id = it->first;
 			if( image_id.isNull() || image_id == IMG_DEFAULT || image_id == IMG_DEFAULT_AVATAR)
 				continue;
 			if (all_textures.find(image_id) == all_textures.end())
@@ -8407,9 +8448,8 @@ void LLVOAvatar::idleUpdateRenderCost()
 		}
 	}
 
-	cost += textures.size() * LLVOVolume::ARC_TEXTURE_COST;
-
 	setDebugText(llformat("%d", cost));
+	mVisualComplexity = cost;
 	F32 green = 1.f-llclamp(((F32) cost-(F32)ARC_LIMIT)/(F32)ARC_LIMIT, 0.f, 1.f);
 	F32 red = llmin((F32) cost/(F32)ARC_LIMIT, 1.f);
 	mText->setColor(LLColor4(red,green,0,1));
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 03c0498a2a..e53b8e3f4b 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -273,6 +273,7 @@ public:
 	//--------------------------------------------------------------------
 public:
 	BOOL			isFullyLoaded() const;
+	bool			isTooComplex() const;
 	bool visualParamWeightsAreDefault();
 protected:
 	virtual BOOL	getIsCloud();
@@ -285,6 +286,7 @@ private:
 	BOOL			mPreviousFullyLoaded;
 	BOOL			mFullyLoadedInitialized;
 	S32				mFullyLoadedFrameCounter;
+	S32				mVisualComplexity;
 	LLFrameTimer	mFullyLoadedTimer;
 	LLFrameTimer	mRuthTimer;
 protected:
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 528c7acbc8..380d63c77b 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -90,6 +90,8 @@ F32 LLVOVolume::sLODFactor = 1.f;
 F32	LLVOVolume::sLODSlopDistanceFactor = 0.5f; //Changing this to zero, effectively disables the LOD transition slop 
 F32 LLVOVolume::sDistanceFactor = 1.0f;
 S32 LLVOVolume::sNumLODChanges = 0;
+S32 LLVOVolume::mRenderComplexity_last = 0;
+S32 LLVOVolume::mRenderComplexity_current = 0;
 LLPointer<LLObjectMediaDataClient> LLVOVolume::sObjectMediaClient = NULL;
 LLPointer<LLObjectMediaNavigateClient> LLVOVolume::sObjectMediaNavigateClient = NULL;
 
@@ -367,6 +369,7 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys,
 		//
 		// Unpack texture entry data
 		//
+
 		S32 result = unpackTEMessage(mesgsys, _PREHASH_ObjectData, block_num);
 		if (result & teDirtyBits)
 		{
@@ -969,18 +972,14 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams &params_in, const S32 detail, bo
 	S32 lod = mLOD;
 
 	BOOL is404 = FALSE;
-
+	
 	if (isSculpted())
 	{
 		// if it's a mesh
 		if ((volume_params.getSculptType() & LL_SCULPT_TYPE_MASK) == LL_SCULPT_TYPE_MESH)
 		{ //meshes might not have all LODs, get the force detail to best existing LOD
-
 			LLUUID mesh_id = volume_params.getSculptID();
 
-			//profile and path params don't matter for meshes
-			volume_params.setType(LL_PCODE_PROFILE_SQUARE, LL_PCODE_PATH_LINE);
-
 			lod = gMeshRepo.getActualMeshLOD(volume_params, lod);
 			if (lod == -1)
 			{
@@ -1036,14 +1035,13 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams &params_in, const S32 detail, bo
 	
 		updateSculptTexture();
 
-
 		if (isSculpted())
 		{
 			updateSculptTexture();
 			// if it's a mesh
 			if ((volume_params.getSculptType() & LL_SCULPT_TYPE_MASK) == LL_SCULPT_TYPE_MESH)
 			{
-				if (getVolume()->getNumVolumeFaces() == 0 || getVolume()->isTetrahedron())
+				if (!getVolume()->isMeshAssetLoaded())
 				{ 
 					//load request not yet issued, request pipeline load this mesh
 					LLUUID asset_id = volume_params.getSculptID();
@@ -1662,11 +1660,16 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable)
 			compiled = TRUE;
 			sNumLODChanges += new_num_faces ;
 	
+			if((S32)getNumTEs() != getVolume()->getNumFaces())
+			{
+				setNumTEs(getVolume()->getNumFaces()); //mesh loading may change number of faces.
+			}
+
 			drawable->setState(LLDrawable::REBUILD_VOLUME); // for face->genVolumeTriangles()
 
 			{
 				LLFastTimer t(FTM_GEN_TRIANGLES);
-				if (new_num_faces != old_num_faces)
+				if (new_num_faces != old_num_faces || mNumFaces != (S32)getNumTEs())
 				{
 					regenFaces();
 				}
@@ -2971,24 +2974,38 @@ const LLMatrix4 LLVOVolume::getRenderMatrix() const
 // total cost is returned value + 5 * size of the resulting set.
 // Cannot include cost of textures, as they may be re-used in linked
 // children, and cost should only be increased for unique textures  -Nyx
-U32 LLVOVolume::getRenderCost(std::set<LLUUID> &textures) const
+U32 LLVOVolume::getRenderCost(texture_cost_t &textures) const
 {
-	// base cost of each prim should be 10 points
-	static const U32 ARC_PRIM_COST = 10;
+	// Get access to params we'll need at various points.  
+	// Skip if this is object doesn't have a volume (e.g. is an avatar).
+	BOOL has_volume = (getVolume() != NULL);
+	LLVolumeParams volume_params;
+	LLPathParams path_params;
+	LLProfileParams profile_params;
+
+	U32 num_triangles = 0;
+
 	// per-prim costs
-	static const U32 ARC_INVISI_COST = 1;
-	static const U32 ARC_SHINY_COST = 1;
-	static const U32 ARC_GLOW_COST = 1;
-	static const U32 ARC_FLEXI_COST = 8;
-	static const U32 ARC_PARTICLE_COST = 16;
-	static const U32 ARC_BUMP_COST = 4;
+	static const U32 ARC_PARTICLE_COST = 1; // determined experimentally
+	static const U32 ARC_PARTICLE_MAX = 2048; // default values
+	static const U32 ARC_TEXTURE_COST = 16; // multiplier for texture resolution - performance tested
+	static const U32 ARC_LIGHT_COST = 500; // static cost for light-producing prims 
+	static const U32 ARC_MEDIA_FACE_COST = 1500; // static cost per media-enabled face 
+
 
-	// per-face costs
-	static const U32 ARC_PLANAR_COST = 1;
-	static const U32 ARC_ANIM_TEX_COST = 4;
-	static const U32 ARC_ALPHA_COST = 4;
+	// per-prim multipliers
+	static const F32 ARC_GLOW_MULT = 1.5f; // tested based on performance
+	static const F32 ARC_BUMP_MULT = 1.25f; // tested based on performance
+	static const F32 ARC_FLEXI_MULT = 5; // tested based on performance
+	static const F32 ARC_SHINY_MULT = 1.6f; // tested based on performance
+	static const F32 ARC_INVISI_COST = 1.2f; // tested based on performance
+	static const F32 ARC_WEIGHTED_MESH = 1.2f; // tested based on performance
 
-	U32 shame = ARC_PRIM_COST;
+	static const F32 ARC_PLANAR_COST = 1.0f; // tested based on performance to have negligible impact
+	static const F32 ARC_ANIM_TEX_COST = 4.f; // tested based on performance
+	static const F32 ARC_ALPHA_COST = 4.f; // 4x max - based on performance
+
+	F32 shame = 0;
 
 	U32 invisi = 0;
 	U32 shiny = 0;
@@ -2997,9 +3014,72 @@ U32 LLVOVolume::getRenderCost(std::set<LLUUID> &textures) const
 	U32 flexi = 0;
 	U32 animtex = 0;
 	U32 particles = 0;
-	U32 scale = 0;
 	U32 bump = 0;
 	U32 planar = 0;
+	U32 weighted_mesh = 0;
+	U32 produces_light = 0;
+	U32 media_faces = 0;
+
+	const LLDrawable* drawablep = mDrawable;
+	U32 num_faces = drawablep->getNumFaces();
+
+	if (has_volume)
+	{
+		volume_params = getVolume()->getParams();
+		path_params = volume_params.getPathParams();
+		profile_params = volume_params.getProfileParams();
+
+		F32 weighted_triangles = -1.0;
+		getStreamingCost(NULL, NULL, &weighted_triangles);
+
+		if (weighted_triangles > 0.0)
+		{
+			num_triangles = (U32)(weighted_triangles); 
+		}
+	}
+
+	if (num_triangles == 0)
+	{
+		num_triangles = 4;
+	}
+
+	if (isSculpted())
+	{
+		if (isMesh())
+		{
+			// base cost is dependent on mesh complexity
+			// note that 3 is the highest LOD as of the time of this coding.
+			S32 size = gMeshRepo.getMeshSize(volume_params.getSculptID(),3);
+			if ( size > 0)
+			{
+				if (gMeshRepo.getSkinInfo(volume_params.getSculptID(), this))
+				{
+					// weighted attachment - 1 point for every 3 bytes
+					weighted_mesh = 1;
+				}
+
+			}
+			else
+			{
+				// something went wrong - user should know their content isn't render-free
+				return 0;
+			}
+		}
+		else
+		{
+			const LLSculptParams *sculpt_params = (LLSculptParams *) getParameterEntry(LLNetworkData::PARAMS_SCULPT);
+			LLUUID sculpt_id = sculpt_params->getSculptTexture();
+			if (textures.find(sculpt_id) == textures.end())
+			{
+				LLViewerFetchedTexture *texture = LLViewerTextureManager::getFetchedTexture(sculpt_id);
+				if (texture)
+				{
+					S32 texture_cost = 256 + (S32)(ARC_TEXTURE_COST * (texture->getFullHeight() / 128.f + texture->getFullWidth() / 128.f));
+					textures.insert(texture_cost_t::value_type(sculpt_id, texture_cost));
+				}
+			}
+		}
+	}
 
 	if (isFlexible())
 	{
@@ -3010,19 +3090,12 @@ U32 LLVOVolume::getRenderCost(std::set<LLUUID> &textures) const
 		particles = 1;
 	}
 
-	const LLVector3& sc = getScale();
-	scale += (U32) sc.mV[0] + (U32) sc.mV[1] + (U32) sc.mV[2];
-
-	const LLDrawable* drawablep = mDrawable;
-
-	if (isSculpted())
+	if (getIsLight())
 	{
-		const LLSculptParams *sculpt_params = (LLSculptParams *) getParameterEntry(LLNetworkData::PARAMS_SCULPT);
-		LLUUID sculpt_id = sculpt_params->getSculptTexture();
-		textures.insert(sculpt_id);
+		produces_light = 1;
 	}
 
-	for (S32 i = 0; i < drawablep->getNumFaces(); ++i)
+	for (S32 i = 0; i < num_faces; ++i)
 	{
 		const LLFace* face = drawablep->getFace(i);
 		const LLTextureEntry* te = face->getTextureEntry();
@@ -3030,77 +3103,137 @@ U32 LLVOVolume::getRenderCost(std::set<LLUUID> &textures) const
 
 		if (img)
 		{
-			textures.insert(img->getID());
+			if (textures.find(img->getID()) == textures.end())
+			{
+				S32 texture_cost = 256 + (S32)(ARC_TEXTURE_COST * (img->getFullHeight() / 128.f + img->getFullWidth() / 128.f));
+				textures.insert(texture_cost_t::value_type(img->getID(), texture_cost));
+			}
 		}
 
 		if (face->getPoolType() == LLDrawPool::POOL_ALPHA)
 		{
-			alpha++;
+			alpha = 1;
 		}
 		else if (img && img->getPrimaryFormat() == GL_ALPHA)
 		{
 			invisi = 1;
 		}
+		if (face->hasMedia())
+		{
+			media_faces++;
+		}
 
 		if (te)
 		{
 			if (te->getBumpmap())
 			{
+				// bump is a multiplier, don't add per-face
 				bump = 1;
 			}
 			if (te->getShiny())
 			{
+				// shiny is a multiplier, don't add per-face
 				shiny = 1;
 			}
 			if (te->getGlow() > 0.f)
 			{
+				// glow is a multiplier, don't add per-face
 				glow = 1;
 			}
 			if (face->mTextureMatrix != NULL)
 			{
-				animtex++;
+				animtex = 1;
 			}
 			if (te->getTexGen())
 			{
-				planar++;
+				planar = 1;
 			}
 		}
 	}
 
+	// shame currently has the "base" cost of 1 point per 15 triangles, min 2.
+	shame = num_triangles  * 5.f;
+	shame = shame < 2.f ? 2.f : shame;
 
-	shame += invisi * ARC_INVISI_COST;
-	shame += shiny * ARC_SHINY_COST;
-	shame += glow * ARC_GLOW_COST;
-	shame += alpha * ARC_ALPHA_COST;
-	shame += flexi * ARC_FLEXI_COST;
-	shame += animtex * ARC_ANIM_TEX_COST;
-	shame += particles * ARC_PARTICLE_COST;
-	shame += bump * ARC_BUMP_COST;
-	shame += planar * ARC_PLANAR_COST;
-	shame += scale;
+	// multiply by per-face modifiers
+	if (planar)
+	{
+		shame *= planar * ARC_PLANAR_COST;
+	}
 
-	LLViewerObject::const_child_list_t& child_list = getChildren();
-	for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
-		 iter != child_list.end(); 
-		 ++iter)
+	if (animtex)
 	{
-		const LLViewerObject* child_objectp = *iter;
-		const LLDrawable* child_drawablep = child_objectp->mDrawable;
-		if (child_drawablep)
-		{
-			const LLVOVolume* child_volumep = child_drawablep->getVOVolume();
-			if (child_volumep)
-			{
-				shame += child_volumep->getRenderCost(textures);
-			}
-		}
+		shame *= animtex * ARC_ANIM_TEX_COST;
 	}
 
-	return shame;
+	if (alpha)
+	{
+		shame *= alpha * ARC_ALPHA_COST;
+	}
+
+	if(invisi)
+	{
+		shame *= invisi * ARC_INVISI_COST;
+	}
+
+	if (glow)
+	{
+		shame *= glow * ARC_GLOW_MULT;
+	}
+
+	if (bump)
+	{
+		shame *= bump * ARC_BUMP_MULT;
+	}
 
+	if (shiny)
+	{
+		shame *= shiny * ARC_SHINY_MULT;
+	}
+
+
+	// multiply shame by multipliers
+	if (weighted_mesh)
+	{
+		shame *= weighted_mesh * ARC_WEIGHTED_MESH;
+	}
+
+	if (flexi)
+	{
+		shame *= flexi * ARC_FLEXI_MULT;
+	}
+
+
+	// add additional costs
+	if (particles)
+	{
+		const LLPartSysData *part_sys_data = &(mPartSourcep->mPartSysData);
+		const LLPartData *part_data = &(part_sys_data->mPartData);
+		U32 num_particles = (U32)(part_sys_data->mBurstPartCount * llceil( part_data->mMaxAge / part_sys_data->mBurstRate));
+		num_particles = num_particles > ARC_PARTICLE_MAX ? ARC_PARTICLE_MAX : num_particles;
+		F32 part_size = (llmax(part_data->mStartScale[0], part_data->mEndScale[0]) + llmax(part_data->mStartScale[1], part_data->mEndScale[1])) / 2.f;
+		shame += num_particles * part_size * ARC_PARTICLE_COST;
+	}
+
+	if (produces_light)
+	{
+		shame += ARC_LIGHT_COST;
+	}
+
+	if (media_faces)
+	{
+		shame += media_faces * ARC_MEDIA_FACE_COST;
+	}
+
+	if (shame > mRenderComplexity_current)
+	{
+		mRenderComplexity_current = (S32)shame;
+	}
+
+	return (U32)shame;
 }
 
-F32 LLVOVolume::getStreamingCost(S32* bytes, S32* visible_bytes)
+F32 LLVOVolume::getStreamingCost(S32* bytes, S32* visible_bytes, F32* unscaled_value) const
 {
 	F32 radius = getScale().length()*0.5f;
 
@@ -3108,7 +3241,7 @@ F32 LLVOVolume::getStreamingCost(S32* bytes, S32* visible_bytes)
 	{	
 		LLSD& header = gMeshRepo.getMeshHeader(getVolume()->getParams().getSculptID());
 
-		return LLMeshRepository::getStreamingCost(header, radius, bytes, visible_bytes, mLOD);
+		return LLMeshRepository::getStreamingCost(header, radius, bytes, visible_bytes, mLOD, unscaled_value);
 	}
 	else
 	{
@@ -3122,11 +3255,18 @@ F32 LLVOVolume::getStreamingCost(S32* bytes, S32* visible_bytes)
 		header["medium_lod"]["size"] = counts[2] * 10;
 		header["high_lod"]["size"] = counts[3] * 10;
 
-		return LLMeshRepository::getStreamingCost(header, radius);
+		return LLMeshRepository::getStreamingCost(header, radius, NULL, NULL, -1, unscaled_value);
 	}	
 }
 
-U32 LLVOVolume::getTriangleCount()
+//static 
+void LLVOVolume::updateRenderComplexity()
+{
+	mRenderComplexity_last = mRenderComplexity_current;
+	mRenderComplexity_current = 0;
+}
+
+U32 LLVOVolume::getTriangleCount() const
 {
 	U32 count = 0;
 	LLVolume* volume = getVolume();
@@ -3153,7 +3293,7 @@ U32 LLVOVolume::getHighLODTriangleCount()
 	else if (isMesh())
 	{
 		LLVolume* ref = LLPrimitive::getVolumeManager()->refVolume(volume->getParams(), 3);
-		if (ref->isTetrahedron() || ref->getNumVolumeFaces() == 0)
+		if (!ref->isMeshAssetLoaded() || ref->getNumVolumeFaces() == 0)
 		{
 			gMeshRepo.loadMesh(this, volume->getParams(), LLModel::LOD_HIGH);
 		}
@@ -3439,7 +3579,7 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& e
 		bool special_cursor = specialHoverCursor();
 		for (S32 i = start_face; i < end_face; ++i)
 		{
-			if (!special_cursor && !pick_transparent && getTE(i)->getColor().mV[3] == 0.f)
+			if (!special_cursor && !pick_transparent && getTE(i) && getTE(i)->getColor().mV[3] == 0.f)
 			{ //don't attempt to pick completely transparent faces unless
 				//pick_transparent is true
 				continue;
@@ -3995,7 +4135,8 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 
 		LLVOVolume* vobj = drawablep->getVOVolume();
 
-		if (vobj->getVolume() && vobj->getVolume()->isTetrahedron() || (vobj->isMesh() && !gMeshRepo.meshRezEnabled()))
+		if (vobj->isMesh() &&
+			(vobj->getVolume() && !vobj->getVolume()->isMeshAssetLoaded() || !gMeshRepo.meshRezEnabled()))
 		{
 			continue;
 		}
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index 13565cb27c..b6347526ee 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -129,9 +129,11 @@ public:
 	const LLMatrix4&	getRelativeXform() const				{ return mRelativeXform; }
 	const LLMatrix3&	getRelativeXformInvTrans() const		{ return mRelativeXformInvTrans; }
 	/*virtual*/	const LLMatrix4	getRenderMatrix() const;
-				U32 	getRenderCost(std::set<LLUUID> &textures) const;
-	/*virtual*/	F32		getStreamingCost(S32* bytes = NULL, S32* visible_bytes = NULL);
-	/*virtual*/ U32		getTriangleCount();
+				typedef std::map<LLUUID, S32> texture_cost_t;
+				U32 	getRenderCost(texture_cost_t &textures) const;
+	/*virtual*/	F32		getStreamingCost(S32* bytes = NULL, S32* visible_bytes = NULL, F32* unscaled_value = NULL) const;
+
+	/*virtual*/ U32		getTriangleCount() const;
 	/*virtual*/ U32		getHighLODTriangleCount();
 	/*virtual*/ BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end, 
 										  S32 face = -1,                        // which face to check, -1 = ALL_SIDES
@@ -320,11 +322,19 @@ protected:
 	LLFace* addFace(S32 face_index);
 	void updateTEData();
 
+	// stats tracking for render complexity
+	static S32 mRenderComplexity_last;
+	static S32 mRenderComplexity_current;
+
 	void requestMediaDataUpdate(bool isNew);
 	void cleanUpMediaImpls();
 	void addMediaImpl(LLViewerMediaImpl* media_impl, S32 texture_index) ;
 	void removeMediaImpl(S32 texture_index) ;
 public:
+
+	static S32 getRenderComplexityMax() {return mRenderComplexity_last;}
+	static void updateRenderComplexity();
+
 	LLViewerTextureAnim *mTextureAnimp;
 	U8 mTexAnimMode;
 private:
@@ -359,8 +369,6 @@ public:
 	static LLPointer<LLObjectMediaDataClient> sObjectMediaClient;
 	static LLPointer<LLObjectMediaNavigateClient> sObjectMediaNavigateClient;
 
-	static const U32 ARC_TEXTURE_COST = 5;
-
 protected:
 	static S32 sNumLODChanges;
 	
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index 3f0640221e..27ee2745b5 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -461,6 +461,7 @@ public:
 		RENDER_DEBUG_PHYSICS_SHAPES     = 0x1000000,
 		RENDER_DEBUG_NORMALS	        = 0x2000000,
 		RENDER_DEBUG_LOD_INFO	        = 0x4000000,
+		RENDER_DEBUG_RENDER_COMPLEXITY  = 0x8000000
 	};
 
 public:
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index d19e56e9a0..b5cc949ebf 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -90,6 +90,9 @@
 	name="LtYellow"
 	value="1 1 .79 1" />
 	<color
+	name="DrYellow"
+	value="1 0.86 0 1" />
+	<color
 	name="LtOrange"
 	value="1 .85 .73 1" />
 	<color
@@ -517,6 +520,9 @@
      name="MenuPopupBgColor"
 	  reference="DkGray2" />
     <color
+     name="ModelUploaderLabels"
+     value="1 0.6 0 1" />	  
+    <color
      name="MultiSliderDisabledThumbColor"
      reference="Black" />
     <color
diff --git a/indra/newview/skins/default/textures/green_checkmark.png b/indra/newview/skins/default/textures/green_checkmark.png
new file mode 100644
index 0000000000..d2a5b348dc
--- /dev/null
+++ b/indra/newview/skins/default/textures/green_checkmark.png
diff --git a/indra/newview/skins/default/textures/red_x.png b/indra/newview/skins/default/textures/red_x.png
new file mode 100644
index 0000000000..a61202f09b
--- /dev/null
+++ b/indra/newview/skins/default/textures/red_x.png
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 68773947ec..a98ef58f50 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -307,9 +307,9 @@ with the same filename but different name
 
   <texture name="menu_separator" file_name="navbar/FileMenu_Divider.png" scale.left="4" scale.top="166" scale.right="0" scale.bottom="0" />
 
-  <texture name="ModelImport_Status_Good" file_name="lag_status_good.tga" preload="false"/>
+  <texture name="ModelImport_Status_Good" file_name="green_checkmark.png" preload="false"/>
   <texture name="ModelImport_Status_Warning" file_name="lag_status_warning.tga" preload="false"/>
-  <texture name="ModelImport_Status_Error" file_name="lag_status_critical.tga" preload="false"/>
+  <texture name="ModelImport_Status_Error" file_name="red_x.png" preload="false"/>
   
   <texture name="MouseLook_View_Off" file_name="bottomtray/MouseLook_view_off.png" preload="false" />
   <texture name="MouseLook_View_On" file_name="bottomtray/MouseLook_view_on.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml
index 578dcd50e5..519efe9ce8 100644
--- a/indra/newview/skins/default/xui/de/floater_about.xml
+++ b/indra/newview/skins/default/xui/de/floater_about.xml
@@ -42,15 +42,23 @@ Voice-Serverversion: [VOICE_VERSION]
 			<button label="In Zwischenablage kopieren" name="copy_btn"/>
 		</panel>
 		<panel label="Danksagung" name="credits_panel">
-			<text_editor name="credits_editor">
-				Second Life wird Ihnen präsentiert von Philip, Tessa, Andrew, Cory, Ian, James, Phoenix, Ryan, Haney, Dan, Char, Ben, John, Tanya, Eddie, Richard, Mitch, Doug, Eric, Frank, Bruce, Aaron, Peter, Alice, Charlie, Debra, Eileen, Helen, Janet, Steffan, Steve, Tom, Mark, Hunter, Xenon, Burgess, Bill, Jim, Lee, Hamlet, Daniel, Jeff, Todd, Sarah, Tim, Stephanie, Colin, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Jack, Vektor, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Jesse, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Yuko, Makiko, Thomas, Harry, Seth, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Brad, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, Beez, Milo, Hermia, Red, Thrax, Gulliver, Joe, Sally, Paul, Jose, Rejean, Dore, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, Dustin, George, Del, Matthew, Cat, Jacqui, Adrian, Viola, Alfred, Noel, Irfan, Yool, Rika, Jane, Frontier, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Jeremy, JP, Jake, Anthony, Maurice, Madhavi, Leopard, Kyle, Joon, Bert, Belinda, Jon, Kristi, Bridie, Pramod, Socrates, Maria, Aric, Adreanne, Jay, Kari, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Colossus, Zen, BigPapi, Pastrami, Kurz, Mani, Neuro, Mel, Sardonyx, MJ, Rowan, Sgt, Elvis, Samuel, Leo, Bryan, Niko, Austin, Soft, Poppy, Rachel, Aki, Banzai, Alexa, Sue, Bender, CG, Angelo, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Rothman, Niall, Marin, Allison, Katie, Dawn, Dusty, Katt, Judy, Andrea, Ambroff, Infinity, Rico, Gail, Kalpana, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Maestro, Simone, Yang, T, Shannon, Nelson, Khanh, Scott, Courtney, Charlene, Quixote, Susan, Zed, Amanda, Katelin, Enkidu, Roxie, Esbee, JoRoan, Scarlet, Tay, Kevin, Wolfgang, Johnny, Ray, Andren, Merov, Bob, Rand, Howard, Callen, Heff, Galen, Newell, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl, Ashley, JessieAnn, Huseby, Karina, Paris, Kurt, Rick, Lis, Kotler, Theeba, Lynx, Murphy, Doten, Taka, Norm, Jillian, Marcus, Mae, Novack, Esther, Perry, Dana, Ducot, Javier, Porter, Madison, Gecko, Dough, JR, Gisele, Crimp, Norie, Arch, Kimi, Fisher, Barbara, Jason, Peggy, Bernard, Jules, Leroy, Eva, Khederian, Campbell, Vogt, Masido, Karel, Torres, Lo, Breezer, Delby, Rountree, Anna, Servus, Rue, Itiaes, Chuck, Luna, Novella, Zaza, Wen, Gino, Lex, Cassandra, Limey, Nancy, Anukul, Silver, Brodesky, Jinsai, Squid, Gez, Rakesh, Ladan, Edelman, Marcet, Squire, Tatem, Tony, Jerm, Tia, Falcon, BK, Tiggs, Driscoll, Bacon, Timothee, Cru, Carmilla, Coyot, Webb, Kazu, Rudas, LJ, Sea, Ali Wallace, Bewest, Pup, Drub, Dragon, Inoshiro, Byron, Rhett, Xandix, Aimee, Fredrik, Thor, Teddy, Baron, Nelly, Ghengis, Epic, Eli, Stone, Grapes, Irie, Prep, Scobu, Valerie, Alain und vielen anderen.
-
-Wir bedanken uns bei folgenden Einwohnern, die uns geholfen haben, dies zur bisher besten Version zu machen: Drew Dwi, Zai Lynch, Latif Khalifa, Ellla McMahon, Harleen Gretzky, Squirrel Wood, Malarthi Behemoth, Dante Tucker, Buckaroo Mu, Eddi Decosta, Dirk, Talamasca, Torben Trautman, Irene Muni, Aralara Rajal, Aura Dirval, Cayu Cluny, Eva Rau, FreeSL Aeon, Frontera Thor, Inma Rau, Lunita Savira, Minerva Memel, Polo Gufler, Xiki Luik, Lilly Zenovka, Vick Forcella, Sasy Scarborough, Gentle Welinder, Elric Anatine, Techwolf Lupindo, Dusan Writer, WolfPup Lowenhar, Marianne McCann, Fiachra Lach, Sitearm Madonna, Sudane Erato, Sahkolihaa Contepomi, Sachi Vixen, Questar Utu, Dimitrio Lewis, Matto Destiny, Scrim Pinion, Radio Signals, Psi Merlin, Pixel Gausman, Mel Vanbeeck, Laurent Bechir, Lamorna Proctor, Lares Carter, Gwyneth Llewelyn, Hydra Shaftoe, Holger Gilruth, Gentle Heron, Carla Broek, Boroondas Gupte, Fury Rosewood, Flower Ducatillon, Colpo Wexler, gwampa Lomu, Borg Capalini, Beansy Twine, Ardy Lay, , 45ms Zhong, Adeon Writer, Aeonix Aeon, Ai Austin, Aiko Ying, Alexandrea Fride, Alliez Mysterio, Annie Milestone, Annika Genezzia, Ansariel Hiller, ArminasX Saiman, Arya Braveheart, Asaeda Meltingdots, Asturkon Jua, Avallyn Oakleaf, Avatar Quinzet, BabyA Littlething, Bacchus Ireto, Bazaar, Riva, Benjamin Bigdipper, Beth Walcher, Bezilon Kasei, Biancaluce Robbiani, Bill Walach, blakopal Galicia, Blitzckreed Levenque, Bryn Oh, Callipygian Christensen, Cap Carver, Carr Arbenlow, Chantal Harvey, Charles Courtois, Charlie Sazaland, Cherry Cheevers, ChickyBabes Zuzu, Christopher  Organiser, Ciaran Laval, Clara Young, Celierra Darling, Corinne Helendale, Corro Moseley, Coughdrop Littlething, Darien Caldwell, Dartagan Shepherd, Debs Regent, Decro Schmooz, Denim Kamachi, DiJodi Dubratt, Dil Spitz, Edgware Marker, Egehan Dryke, Emma Portilo, Emmie Fairymeadow, Evangelista Emerald, Faelon Swordthain, Frenchimmo Sabra, Gaberoonie Zanzibar, Ganymedes Costagravas, Gene Frostbite, GeneJ Composer, Giggles Littlebird, Grady Echegaray, Guni Greenstein, Gypsy Tripsa, Hackshaven Harford, Ham Rambler, Han Shuffle, Hanglow Short, Hatzfeld Runo, herina Bode, Horatio Freund, Hypatia Callisto, Hypatia Pickens, Identity Euler, Imnotgoing Sideways, Innula Zenovka, Iyoba Tarantal, Jack Abraham, Jagga Meredith, Jennifer Boyle, Jeremy Marquez, Jessica Qin, Jinx Nordberg, Jo Bernandes, Jocial Sonnenkern, Joel Savard, Jondan Lundquist, Josef Munster, Josette Windlow, Juilan Tripsa, Juro Kothari, Justin RiversRunRed, Kagehi Kohn, Kaimen Takahe, Keklily Longfall, Ken Lavender, Kestral Karas, Khisme Nitely, Kimar Coba, Kithrak Kirkorian, Kitty Barnett, Kolor Fall, Komiko Okamoto, Korvel Noh, Larry Pixel, Leal Choche, len Starship, Lenae Munz, Lexi Frua, Lillie Cordeaux, Lizzy Macarthur, LSL Scientist, Luban Yiyuan, Luc Starsider, Maccus McCullough, Madison Blanc, Maggie Darwin, Mallory Destiny, Manx Wharton, Marc Claridge, Marc2 Sands, Matthew Anthony, Maxim RiversRunRed, Medhue Simoni, Melinda Latynina, Mencius Watts, Michi Lumin, Midian Farspire, Miles Glaz, Mindy Mathy, Mitch Wagner, Mo Hax, Mourna Biziou, Nao Noe, naofan Teardrop, Naomah Beaumont, Nathiel Siamendes, Nber Medici, Neko Link, Netpat Igaly, Neutron Chesnokov, Newfie Pendragon, Nicholai Laviscu, Nick Rhodes, Nicoladie Gymnast, Ollie Kubrick, Orenj Marat, Orion Delphis, Oryx Tempel, Parvati Silverweb, PeterPunk Mooney, Pixel Scientist, Pounce Teazle, Professor Noarlunga, Quantum Destiny, Quicksilver Hermes, Ralf Setsuko, RAT Quan, RedMokum Bravin, Revolution Perenti, Rezit Sideways, Rich Grainger, Rosco Teardrop, Rose Evans, Rudee Voom, RufusTT Horsefly, Saii Hallard, SaintLEOlions Zimer, Samm Larkham, Satanello Miami, SexySteven Morrisey, Sheet Spotter, Shnurui Troughton, sicarius Thorne, Sicarius Toxx, Sini Nubalo, SLB Wirefly, snowy Sidran, Soupa Segura, ST Mensing, Starshine Halasy, Stickman Ingmann, Synystyr Texan, Takeda Terrawyng, Tali Rosca, Templar Merlin, Tezcatlipoca Bisiani, Tiel Stonecutter, Tony Kembia, TouchaHoney Perhaps, Trey Reanimator, TriloByte Zanzibar, Trinity Dechou, Trinity Dejavu, Unlikely Quintessa, UsikuFarasi Kanarik, Veritas Raymaker, Vex Streeter, Viaticus Speculaas, Villain Baroque, Vixie Durant, Void Singer, Watty Berkson, Westley Schridde, Westley Streeter, Whimsy Winx, Winter Ventura, Wundur Primbee, xstorm Radek, YongYong Francois, Zak Westminster, Zana Kohime, Zaren Alexander, Zeja Pyle, ZenMondo Wormser, Zoex Flanagan und vielen anderen.
-
-
-
-
-„Die Arbeit beginnt aufs Neue, die Hoffnung lebt weiter, und der Traum wird niemals sterben.“ - Edward Kennedy
+			<text name="linden_intro">
+				Second Life wird präsentiert von den Lindens:
+			</text>
+			<text_editor name="linden_names">
+				Philip, Andrew, Doug, Richard, Phoenix, Ian, Mark, Robin, Dan, Char, Ryan, Eric, Jim, Lee, Jeff, Michael, Kelly, Steve, Catherine, Bub, Ramzi, Jill, Jeska, Don, Kona, Callum, Charity, Jack, Shawn, babbage, James, Lauren, Blue, Brent, Reuben, Pathfinder, Jesse, Patsy, Torley, Bo, Cyn, Jonathan, Gia, Annette, Ginsu, Harry, Lex, Runitai, Guy, Cornelius, Beth, Swiss, Thumper, Wendy, Teeple, Seth, Dee, Mia, Sally, Liana, Aura, Beez, Milo, Red, Gulliver, Marius, Joe, Jose, Dore, Justin, Nora, Morpheus, Lexie, Amber, Chris, Xan, Leyla, Walker, Sabin, Joshua, Hiromi, Tofu, Fritz, June, Jean, Ivy, Dez, Ken, Betsy, Which, Spike, Rob, Zee, Dustin, George, Claudia, del, Matthew, jane, jay, Adrian, Yool, Rika, Yoz, siobhan, Qarl, Benjamin, Beast, Everett, madhavi, Christopher, Izzy, stephany, Jeremy, sean, adreanne, Pramod, Tobin, sejong, Iridium, maurice, kj, Meta, kari, JP, bert, kyle, Jon, Socrates, Bridie, Ivan, maria, Aric, Coco, Periapse, sandy, Storrs, Lotte, Colossus, Brad, Pastrami, Zen, BigPapi, Banzai, Sardonyx, Mani, Garry, Jaime, Neuro, Samuel, Niko, CeeLo, Austin, Soft, Poppy, emma, tessa, angelo, kurz, alexa, Sue, CG, Blake, Erica, Brett, Bevis, kristen, Q, simon, Enus, MJ, laurap, Kip, Scouse, Ron, Ram, kend, Marty, Prospero, melissa, kraft, Nat, Seraph, Hamilton, Lordan, Green, miz, Ashlei, Trinity, Ekim, Echo, Charlie, Rowan, Rome, Jt, Doris, benoc, Christy, Bao, Kate, Tj, Patch, Cheah, Johan, Brandy, Angela, Oreh, Cogsworth, Lan, Mitchell, Space, Bambers, Einstein, Bender, Malbers, Matias, Maggie, Rothman, Milton, Niall, Marin, Allison, Mango, Andrea, Katt, Yi, Ambroff, Rico, Raymond, Gail, Christa, William, Dawn, Usi, Dynamike, M, Corr, Dante, Molly, kaylee, Danica, Kelv, Lil, jacob, Nya, Rodney, elsie, Blondin, Grant, Nyx, Devin, Monty, Minerva, Keira, Katie, Jenn, Makai, Clare, Joy, Cody, Gayathri, FJ, spider, Oskar, Landon, Jarv, Noelle, Al, Doc, Gray, Vir, t, Maestro, Simone, Shannon, yang, Courtney, Scott, charlene, Quixote, Susan, Zed, Amanda, Katelin, Esbee, JoRoan, Enkidu, roxie, Scarlet, Merov, Kevin, Judy, Rand, Newell, Les, Dessie, Galen, Michon, Geo, Siz, Calyle, Pete, Praveen, Callen, Sheldon, Pink, Nelson, jenelle, Terrence, Nathan, Juan, Sascha, Huseby, Karina, Kaye, Kotler, Lis, Darv, Charrell, Dakota, Kimmora, Theeba, Taka, Mae, Perry, Ducot, dana, Esther, Dough, gisele, Doten, Viale, Fisher, jessieann, ashley, Torres, delby, rountree, kurt, Slaton, Madison, Rue, Gino, Wen, Casssandra, Brodesky, Squid, Gez, Rakesh, Gecko, Ladan, Tony, Tatem, Squire, Falcon, BK, Crimp, Tiggs, Bacon, Coyot, Carmilla, Webb, Sea, Arch, Jillian, Jason, Bernard, Vogt, Peggy, dragon, Pup, xandix, Wallace, Bewest, Inoshiro, Rhett, AG, Aimee, Ghengis, Itiaes, Eli, Steffan, Epic, Grapes, Stone, Prep, Scobu, Robert, Alain, Carla, Vicky, Tia, Alec, Taras, Lisa, Oz, Ariane, Log, House, Kazu, Kim, Drofnas, Tyler, Campbell, Michele, Madeline, Nelly, Baron, Thor, Lori, Hele, Fredrik, Teddy, Pixie, Berry, Gabrielle, Alfonso, Brooke, Wolf, Ringo, Cru, Charlar, Rodvik, Gibson, Elise, Bagman, Greger, Leonidas, Jerm, Leslie, CB, Brenda, Durian, Carlo, mm, Zeeshan, Caleb, Max, Elikak, Mercille, Steph, Chase
+			</text_editor>
+			<text name="contrib_intro">
+				mit Open-Source-Beiträgen von:
+			</text>
+			<text_editor name="contrib_names">
+				Dummy-Name wird zur Laufzeit ersetzt
+			</text_editor>
+			<text name="trans_intro">
+				mit Ãœbersetzungen von:
+			</text>
+			<text_editor name="trans_names">
+				Dummy Name wird zur Laufzeit ersetzt
 			</text_editor>
 		</panel>
 		<panel label="Lizenzen" name="licenses_panel">
diff --git a/indra/newview/skins/default/xui/de/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/de/floater_preferences_proxy.xml
new file mode 100644
index 0000000000..cdefb470c2
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_preferences_proxy.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Proxy Settings Floater" title="Proxy-Einstellungen">
+	<check_box initial_value="false" label="HTTP-Proxy für Webseiten verwenden" name="web_proxy_enabled"/>
+	<text name="http_proxy_label">
+		HTTP-Proxy:
+	</text>
+	<line_editor name="web_proxy_editor" tool_tip="DNS-Name oder IP-Adresse des gewünschten HTTP-Proxys."/>
+	<spinner label="Portnummer:" name="web_proxy_port" tool_tip="Portnummer des gewünschten HTTP-Proxys."/>
+	<check_box label="SOCKS 5-Proxy für UDP-Verkehr verwenden" name="socks_proxy_enabled"/>
+	<text name="socks5_proxy_label">
+		SOCKS 5-Proxy:
+	</text>
+	<line_editor name="socks_proxy_editor" tool_tip="DNS-Name oder IP-Adresse des gewünschten SOCKS 5-Proxys."/>
+	<spinner label="Portnummer:" name="socks_proxy_port" tool_tip="Portnummer des gewünschten SOCKS 5-Proxys."/>
+	<text name="socks_auth_label">
+		SOCKS-Authentifizierung:
+	</text>
+	<radio_group name="socks5_auth_type">
+		<radio_item label="Keine Authentifizierung" name="Socks5NoAuth" tool_tip="SOCKS 5-Proxy erfordert keine Authentifizierung." value="Keine"/>
+		<radio_item label="Benutzername/Kennwort" name="Socks5UserPass" tool_tip="SOCKS 5-Proxy erfordert Authentifizierung per Benutzername/Kennwort." value="UserPass"/>
+	</radio_group>
+	<text name="socks5_username_label">
+		Benutzername:
+	</text>
+	<text name="socks5_password_label">
+		Kennwort:
+	</text>
+	<line_editor name="socks5_username" tool_tip="Benutzername zur Authentifizierung über Ihren SOCKS 5-Server"/>
+	<line_editor name="socks5_password" tool_tip="Kennwort zur Authentifizierung über Ihren SOCKS 5-Server"/>
+	<text name="other_proxy_label">
+		Anderer HTTP-Verkehrs-Proxy:
+	</text>
+	<radio_group name="other_http_proxy_type">
+		<radio_item label="Keinen Proxy verwenden" name="OtherNoProxy" tool_tip="Nicht-Web-HTTP-Verkehr wird an KEINEN Proxy weitergeleitet." value="Keiner"/>
+		<radio_item label="HTTP-Proxy verwenden" name="OtherHTTPProxy" tool_tip="Nicht-Web-HTTP-Verkehr wird über den konfigurierten Web-Proxy weitergeleitet." value="Web"/>
+		<radio_item label="SOCKS 5-Proxy verwenden" name="OtherSocksProxy" tool_tip="Nicht-Web-HTTP-Verkehr wird über den konfigurierten SOCKS 5-Proxy weitergeleitet." value="SOCKS"/>
+	</radio_group>
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/menu_inventory.xml b/indra/newview/skins/default/xui/de/menu_inventory.xml
index 9fcd41e62a..733a0b85c3 100644
--- a/indra/newview/skins/default/xui/de/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/de/menu_inventory.xml
@@ -83,5 +83,7 @@
 	<menu_item_call label="Bearbeiten" name="Wearable Edit"/>
 	<menu_item_call label="Hinzufügen" name="Wearable Add"/>
 	<menu_item_call label="Ausziehen" name="Take Off"/>
+	<menu_item_call label="In Händler-Outbox kopieren" name="Merchant Copy"/>
+	<menu_item_call label="In Händler-Outbox verschieben" name="Merchant Move"/>
 	<menu_item_call label="--keine Optionen--" name="--no options--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/de/menu_media_ctrl.xml b/indra/newview/skins/default/xui/de/menu_media_ctrl.xml
index 781796670a..59c1c2ee86 100644
--- a/indra/newview/skins/default/xui/de/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/de/menu_media_ctrl.xml
@@ -3,4 +3,5 @@
 	<menu_item_call label="Ausschneiden" name="Cut"/>
 	<menu_item_call label="Kopieren" name="Copy"/>
 	<menu_item_call label="Einfügen" name="Paste"/>
+	<menu_item_call label="Webinspektor öffnen" name="open_webinspector"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_mode_change.xml b/indra/newview/skins/default/xui/de/menu_mode_change.xml
new file mode 100644
index 0000000000..b8090018b7
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_mode_change.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Mode Change">
+	<menu_item_check label="Basis" name="BasicMode"/>
+	<menu_item_check label="Erweitert" name="AdvancedMode"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index e010844206..7c6918a4ee 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -138,7 +138,6 @@
 			<menu_item_call label="Sound ([COST] L$)..." name="Upload Sound"/>
 			<menu_item_call label="Animation ([COST] L$)..." name="Upload Animation"/>
 			<menu_item_call label="Modell..." name="Upload Model"/>
-			<menu_item_call label="Modellassistent..." name="Upload Model Wizard"/>
 			<menu_item_call label="Mehrfach-Upload ([COST] L$ pro Datei)..." name="Bulk Upload"/>
 		</menu>
 		<menu_item_call label="Rückgängig" name="Undo"/>
@@ -253,6 +252,7 @@
 			<menu_item_check label="Matrizen anzeigen" name="Show Matrices"/>
 			<menu_item_check label="Farbe unter Cursor anzeigen" name="Show Color Under Cursor"/>
 			<menu_item_check label="Speicher anzeigen" name="Show Memory"/>
+			<menu_item_check label="Info über privaten Speicher anzeigen" name="Show Private Mem Info"/>
 			<menu_item_check label="Akutalisierungen an Objekten anzeigen" name="Show Updates"/>
 		</menu>
 		<menu label="Fehler erzwingen" name="Force Errors">
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 1971061096..4c53c40d86 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -85,6 +85,19 @@ Stellen Sie sicher, dass Ihre Internetverbindung funktioniert.
 		Änderung an aktueller Kleidung/Körperteil speichern?
 		<usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Nicht speichern" yestext="Speichern"/>
 	</notification>
+	<notification name="ConfirmNoCopyToOutbox">
+		Ihnen fehlt die Berechtigung zum Kopieren dieses Artikels in die Händler-Outbox. Möchten Sie wirklich den folgenden Artikel verschieben?
+        [ITEM_NAME]
+		<usetemplate name="okcancelbuttons" notext="Nein" yestext="Ja"/>
+	</notification>
+	<notification name="OutboxUploadComplete">
+		Marktplatz-Upload abgeschlossen.
+		<usetemplate name="okbutton" yestext="Hurra!"/>
+	</notification>
+	<notification name="OutboxUploadHadErrors">
+		Marktplatz-Upload mit Fehlern abgeschlossen. Korrigieren Sie die Fehler in Ihrer Outbox und versuchen Sie es erneut. Vielen Dank!
+		<usetemplate name="okbutton" yestext="Erneut versuchen"/>
+	</notification>
 	<notification name="CompileQueueSaveText">
 		Der Text für ein Skript konnte aus folgendem Grund nicht hochgeladen werden: [REASON]. Bitte versuchen Sie es erneut.
 	</notification>
@@ -2436,7 +2449,15 @@ Versuchen Sie es in einigen Minuten erneut.
 		<form name="form">
 			<button name="Keep" text="Behalten"/>
 			<button name="Discard" text="Verwerfen"/>
-			<button name="Mute" text="Ignorieren"/>
+			<button name="Mute" text="Eigentümer blockieren"/>
+		</form>
+	</notification>
+	<notification name="OwnObjectGiveItem">
+		Ein Objekt namens &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; hat Ihnen folgende/n/s [OBJECTTYPE] übergeben:
+&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
+		<form name="form">
+			<button name="Keep" text="Beibehalten"/>
+			<button name="Discard" text="Verwerfen"/>
 		</form>
 	</notification>
 	<notification name="UserGiveItem">
@@ -2580,6 +2601,7 @@ Anfrage gestatten?
 		„&lt;nolink&gt;[TITLE]&lt;/nolink&gt;“ von [NAME]
 [MESSAGE]
 		<form name="form">
+			<button name="Mute" text="Blockieren"/>
 			<button name="Ignore" text="Ignorieren"/>
 		</form>
 	</notification>
@@ -2587,6 +2609,7 @@ Anfrage gestatten?
 		„&lt;nolink&gt;[TITLE]&lt;/nolink&gt;“ von [GROUPNAME]
 [MESSAGE]
 		<form name="form">
+			<button name="Mute" text="Blockieren"/>
 			<button name="Ignore" text="Ignorieren"/>
 		</form>
 	</notification>
@@ -2915,6 +2938,12 @@ Durch Ausblenden der Schaltfläche „Sprechen“ wird die Sprechfunktion deakti
 	<notification label="Sie haben Linden-Dollar!" name="HintLindenDollar">
 		Hier wird Ihr aktueller L$-Kontostand angezeigt. Klicken Sie auf „L$ kaufen“, um mehr Linden-Dollar zu kaufen.
 	</notification>
+	<notification name="LowMemory">
+		Nicht genügend Arbeitsspeicher. Einige SL-Funktionen werden deaktiviert, um einen Absturz zu verhindern. Schließen Sie andere Anwendungen. Starten Sie SL neu, falls dieser Fehler erneut auftritt.
+	</notification>
+	<notification name="ForceQuitDueToLowMemory">
+		SL wird wegen Speichermangel in 30 Sekunden beendet.
+	</notification>
 	<notification name="PopupAttempt">
 		Ein Popup konnte nicht geöffnet werden.
 		<form name="form">
@@ -2922,6 +2951,54 @@ Durch Ausblenden der Schaltfläche „Sprechen“ wird die Sprechfunktion deakti
 			<button name="open" text="Popup-Fenster öffnen"/>
 		</form>
 	</notification>
+	<notification name="SOCKS_NOT_PERMITTED">
+		SOCKS 5-Proxy „[HOST]:[PORT]“ hat Verbindungsverbindung abgewiesen, da laut Regelsatz nicht zulässig.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_CONNECT_ERROR">
+		SOCKS 5-Proxy „[HOST]:[PORT]“ hat den Verbindungsversuch abgewiesen. Der TCP-Kanal konnte nicht geöffnet werden.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_NOT_ACCEPTABLE">
+		SOCKS 5-Proxy „[HOST]:[PORT]“ hat das ausgewählte Authentifizierungssystem abgewiesen.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_AUTH_FAIL">
+		SOCKS 5-Proxy „[HOST]:[PORT]“ hat gemeldet, dass Ihre Angaben ungültig sind.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_UDP_FWD_NOT_GRANTED">
+		SOCKS 5-Proxy „[HOST]:[PORT]“ hat die Anforderung UDP ASSOCIATE abgewiesen.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_HOST_CONNECT_FAILED">
+		Keine Verbindung möglich zum SOCKS 5-Proxy-Server „[HOST]:[PORT]“.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_UNKNOWN_STATUS">
+		Unbekannter Proxy-Fehler bei Server „[HOST]:[PORT]“.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_INVALID_HOST">
+		SOCKS-Proxy-Address oder Port „[HOST]:[PORT]“ ungültig.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_BAD_CREDS">
+		SOCKS 5-Benutzername oder -Kennwort ungültig.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="PROXY_INVALID_HTTP_HOST">
+		HTTP-Proxy-Address oder Port „[HOST]:[PORT]“ ungültig.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="PROXY_INVALID_SOCKS_HOST">
+		SOCKS-Proxy-Address oder Port „[HOST]:[PORT]“ ungültig.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="ChangeProxySettings">
+		Proxy-Einstellungen treten nach Neustart von [APP_NAME] in Kraft.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="AuthRequest">
 		Für die Site „&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;“ in der Domäne „[REALM]“ ist ein Benutzername und Kennwort erforderlich.
 		<form name="form">
diff --git a/indra/newview/skins/default/xui/de/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/de/panel_outbox_inventory.xml
new file mode 100644
index 0000000000..4006022ffc
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_outbox_inventory.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<outbox_inventory_panel name="inventory_outbox" tool_tip="Legen Sie Artikel hier ab, um sie zum Verkauf in Ihrem Laden vorzubereiten"/>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
index 490cead17d..8b18bf8659 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
@@ -11,17 +11,6 @@
 	</text>
 	<check_box label="Eigener Port" name="connection_port_enabled"/>
 	<spinner label="Port-Nummer:" name="connection_port"/>
-	<text name="cache_size_label_l">
-		Cachegröße
-	</text>
-	<text name="text_box5">
-		MB
-	</text>
-	<text name="Cache location">
-		Cache-Ordner:
-	</text>
-	<button label="Durchsuchen" label_selected="Durchsuchen" name="set_cache"/>
-	<button label="Zurücksetzen" label_selected="Zurücksetzen" name="reset_cache"/>
 	<text name="Web:">
 		Web:
 	</text>
@@ -33,12 +22,6 @@
 	<check_box initial_value="true" label="Cookies annehmen" name="cookies_enabled"/>
 	<check_box initial_value="true" label="Javascript aktivieren" name="browser_javascript_enabled"/>
 	<check_box initial_value="false" label="Medienbrowser-Popups aktivieren" name="media_popup_enabled"/>
-	<check_box initial_value="false" label="Web-Proxy aktivieren" name="web_proxy_enabled"/>
-	<text name="Proxy location">
-		Proxy-Standort:
-	</text>
-	<line_editor name="web_proxy_editor" tool_tip="Name oder IP Adresse des Proxyservers, den Sie benutzen möchten"/>
-	<spinner label="Portnummer:" name="web_proxy_port"/>
 	<text name="Software updates:">
 		Softwareupdates:
 	</text>
@@ -46,4 +29,8 @@
 		<combo_box.item label="Automatisch installieren" name="Install_automatically"/>
 		<combo_box.item label="Updates manuell herunterladen und installieren" name="Install_manual"/>
 	</combo_box>
+	<text name="Proxy Settings:">
+		Proxy-Einstellungen:
+	</text>
+	<button label="Proxy-Einstellungen ändern" label_selected="Durchsuchen" name="set_proxy"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_status_bar.xml b/indra/newview/skins/default/xui/de/panel_status_bar.xml
index 04ed58f944..e9de350ee7 100644
--- a/indra/newview/skins/default/xui/de/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/de/panel_status_bar.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="status">
-	<panel.string name="StatBarDaysOfWeek">
-		Sonntag:Montag:Dienstag:Mittwoch:Donnerstag:Freitag:Samstag
-	</panel.string>
-	<panel.string name="StatBarMonthsOfYear">
-		Januar:Februar:März:April:Mai:Juni:Juli:August:September:Oktober:November:Dezember
-	</panel.string>
 	<panel.string name="packet_loss_tooltip">
 		Paketverlust
 	</panel.string>
@@ -25,6 +19,10 @@
 		<text name="balance" tool_tip="Klicken, um L$-Guthaben zu aktualisieren" value="20 L$"/>
 		<button label="L$ kaufen" name="buyL" tool_tip="Hier klicken, um mehr L$ zu kaufen"/>
 	</panel>
+	<combo_box name="mode_combo" tool_tip="Wählen Sie den gewünschten Modus aus. Basismodus: Second Life schnell und einfach erkunden und chatten. Erweiterter Modus: Zugriff auf zusätzliche Funktionen.">
+		<combo_box.item label="Basismodus" name="Basic"/>
+		<combo_box.item label="Erweiterter Modus" name="Advanced"/>
+	</combo_box>
 	<text name="TimeText" tool_tip="Aktuelle Zeit (Pazifik)">
 		24:00 H PST
 	</text>
diff --git a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml
index 3dd1bfb357..674ea3376b 100644
--- a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml
@@ -2,35 +2,47 @@
 <panel label="Sonstiges" name="objects panel">
 	<panel label="" name="sidepanel__inventory_panel">
 		<layout_stack name="inventory_layout_stack">
-			<layout_panel name="inbox_layout_panel">
-				<panel label="" name="marketplace_inbox">
-					<string name="InboxLabelWithArg">
-						Erhaltene Objekte ([NUM])
-					</string>
-					<string name="InboxLabelNoArg">
-						Erhaltene Objekte
-					</string>
-					<button label="Erhaltene Objekte" name="inbox_btn"/>
-					<text name="inbox_fresh_new_count">
-						[NUM] neu
-					</text>
-					<panel tool_tip="Drag and drop items to your inventory to manage and use them">
-						<text name="inbox_inventory_placeholder">
-							Einkäufe auf dem Marktplatz werden hierher geliefert.
-						</text>
-					</panel>
-				</panel>
-			</layout_panel>
-			<layout_panel name="outbox_layout_panel">
-				<panel label="" name="marketplace_outbox">
-					<button label="Händler-Outbox" name="outbox_btn"/>
-					<button label="" name="outbox_sync_btn" tool_tip="Zu meiner Marktplatz-Storefront verschieben"/>
-					<panel tool_tip="Drag and drop items here to prepare them for sale on your storefront">
-						<text name="outbox_inventory_placeholder">
-							Richtigen Sie ein Händlerkonto ein, um diese Funktion zu verwenden.
-						</text>
-					</panel>
-				</panel>
+			<layout_panel name="inbox_outbox_layout_panel">
+				<layout_stack name="inbox_outbox_layout_stack">
+					<layout_panel name="inbox_layout_panel">
+						<panel label="" name="marketplace_inbox">
+							<string name="InboxLabelWithArg">
+								Erhaltene Artikel ([NUM])
+							</string>
+							<string name="InboxLabelNoArg">
+								Erhaltene Artikel
+							</string>
+							<button label="Erhaltene Artikel" name="inbox_btn"/>
+							<text name="inbox_fresh_new_count">
+								[NUM] neu
+							</text>
+							<panel tool_tip="Drag and drop items to your inventory to manage and use them">
+								<text name="inbox_inventory_placeholder">
+									Einkäufe auf dem Marktplatz werden hierher geliefert.
+								</text>
+							</panel>
+						</panel>
+					</layout_panel>
+					<layout_panel name="outbox_layout_panel">
+						<panel label="" name="marketplace_outbox">
+							<string name="OutboxLabelWithArg">
+								Händler-Outbox ([NUM])
+							</string>
+							<string name="OutboxLabelNoArg">
+								Händler-Outbox
+							</string>
+							<button label="Händler-Outbox" name="outbox_btn"/>
+							<button label="" name="outbox_sync_btn" tool_tip="In meinen Marktplatz-Laden verschieben"/>
+							<panel>
+								<panel name="outbox_inventory_placeholder_panel">
+									<text name="outbox_inventory_placeholder_title">
+										Laden...
+									</text>
+								</panel>
+							</panel>
+						</panel>
+					</layout_panel>
+				</layout_stack>
 			</layout_panel>
 		</layout_stack>
 		<panel name="button_panel">
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 902f97efab..435f3494b0 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -339,6 +339,18 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 		Sie können nur ein einzelnes Objekt hierher ziehen
 	</string>
 	<string name="TooltipPrice" value="[AMOUNT] L$"/>
+	<string name="TooltipOutboxNoTransfer">
+		Eines oder mehrere dieser Objekte können nicht verkauft oder an einen anderen Benutzer übertragen werden.
+	</string>
+	<string name="TooltipOutboxWorn">
+		Sie tragen eines oder mehrere dieser Objekte. Nehmen Sie es/sie von Ihrem Avatar ab und versuchen Sie dann erneut, es/sie zu verschieben.
+	</string>
+	<string name="TooltipOutboxFolderLevels">
+		Dieser Ordner hat zu viele Unterordnerebenen. Ordnen Sie die Unterordner so an, dass maximal vier Verschachtelungsebenen vorhanden sind (Stammordner enthält A enthält B enthält C).
+	</string>
+	<string name="TooltipOutboxTooManyObjects">
+		Dieser Ordner enthält mehr als 200 Objekte. Verpacken Sie einige dieser Artikel in Behältern, um die Anzahl zu verringern.
+	</string>
 	<string name="TooltipHttpUrl">
 		Anklicken, um Webseite anzuzeigen
 	</string>
@@ -1204,8 +1216,65 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="InventoryInboxNoItems">
 		Objekte, die auf dem Marktplatz gekauft wurden, werden hierher geliefert.
 	</string>
+	<string name="MarketplaceURL">
+		http://marketplace.[DOMAIN_NAME]
+	</string>
+	<string name="MarketplaceURL_CreateStore">
+		http://marketplace.[DOMAIN_NAME]/create_store
+	</string>
+	<string name="MarketplaceURL_LearnMore">
+		http://marketplace.[DOMAIN_NAME]/learn_more
+	</string>
+	<string name="InventoryOutboxCreationErrorTitle">
+		Ihre Händler-Outbox ist nicht richtig konfiguriert
+	</string>
+	<string name="InventoryOutboxCreationErrorTooltip">
+		Konfigurationsfehler in Händler-Outbox
+	</string>
+	<string name="InventoryOutboxCreationError">
+		Wenden Sie sich zur Behebung des Problems an den Kundendienst.
+	</string>
+	<string name="InventoryOutboxNotMerchantTitle">
+		Jeder kann Artikel im Marktplatz verkaufen
+	</string>
+	<string name="InventoryOutboxNotMerchantTooltip">
+		Werden Sie Händler!
+	</string>
+	<string name="InventoryOutboxNotMerchant">
+		[[MARKETPLACE_URL] Im Second Life Marktplatz] werden über eine Million virtuelle Produkte zum Verkauf angeboten, die alle von Einwohnern erstellt wurden. Auch Sie können selbst erstellte Artikel sowie bestimmte gekaufte Artikel verkaufen. Die Einrichtung eines Händlerkontos geht blitzschnell und ist kostenlos. [[LEARN_MORE_URL] Lesen Sie weitere Informationen] oder [[CREATE_STORE_URL] öffnen Sie einen Laden] im Marktplatz, um Ihre Objekte zu verkaufen.
+	</string>
+	<string name="InventoryOutboxNoItemsTitle">
+		Eine neue Methode, um Artikel in den Marktplatz zu übertragen
+	</string>
+	<string name="InventoryOutboxNoItemsTooltip">
+		Legen Sie Artikel hier ab, um sie zum Verkauf im Marktplatz vorzubereiten
+	</string>
 	<string name="InventoryOutboxNoItems">
-		Objekte hierher ziehen, um Sie in Ihrer Marktplatz-Storefront zum Verkauf anzubieten.
+		Ziehen Sie zu verkaufende Artikel oder Ordner in diesen Bereich. Es erscheinen Kopien der Artikel; Ihr Inventar bleibt unverändert, es sei denn, es handelt sich um einen nicht kopierbaren Artikel. Wenn die Artikel in den Marktplatz übertragen werden sollen, klicken Sie auf die Schaltfläche „Hochladen“. Nach Übertragung der Artikel in Ihr Marktplatz-Inventar verschwinden sie aus diesem Ordner.
+	</string>
+	<string name="Marketplace Error None">
+		Keine Fehler
+	</string>
+	<string name="Marketplace Error Not Merchant">
+		Fehler: Bevor Sie Artikel in den Marktplatz übertragen können, müssen Sie sich als Händler registrieren (kostenlos).
+	</string>
+	<string name="Marketplace Error Empty Folder">
+		Fehler: Dieser Ordner ist leer.
+	</string>
+	<string name="Marketplace Error Unassociated Products">
+		Fehler: Dieser Artikel konnte nicht hochgeladen werden, da in Ihrem Händlerkonto zu viele Artikel nicht mit Produkten verknüpft sind. Um diesen Fehler zu beheben, melden Sie sich auf der Marktplatz-Website an und reduzieren Sie die Anzahl von Artikeln, die nicht mit Produkten verknüpft sind.
+	</string>
+	<string name="Marketplace Error Object Limit">
+		Fehler: Dieser Artikel enthält zu viele Objekte. Beheben Sie diesen Fehler, indem Sie Objekte zusammen in Behältern verpacken, um die Objektanzahl auf unter 200 zu verringern.
+	</string>
+	<string name="Marketplace Error Folder Depth">
+		Fehler: Dieser Artikel enthält zu viele verschachtelte Ordnerebenen. Organisieren Sie ihn neu, sodass maximal drei verschachtelte Ordnerebenen vorhanden sind.
+	</string>
+	<string name="Marketplace Error Unsellable Item">
+		Fehler: Dieser Artikel kann nicht im Marktplatz verkauft werden.
+	</string>
+	<string name="Marketplace Error Internal Import">
+		Fehler: Bei diesem Artikel ist ein Problem aufgetreten. Versuchen Sie es später erneut.
 	</string>
 	<string name="no_transfer" value=" (kein Transferieren)"/>
 	<string name="no_modify" value=" (kein Bearbeiten)"/>
@@ -4185,7 +4254,7 @@ Missbrauchsbericht
 	<string name="Female - Wow">
 		Weiblich - Wow
 	</string>
-	<string name="/bow">
+	<string name="/bow1">
 		/verbeugen
 	</string>
 	<string name="/clap">
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 3dd394bac1..2580c06344 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -23,7 +23,7 @@ Built with [COMPILER] version [COMPILER_VERSION]
      name="AboutPosition">
 You are at [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] located at &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
 [SERVER_VERSION]
-[[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]]
+[SERVER_RELEASE_NOTES_URL]
 
 </floater.string>
   <!-- *NOTE: Do not translate text like GPU, Graphics Card, etc -
@@ -59,6 +59,10 @@ Voice Server Version: [VOICE_VERSION]
      name="AboutTraffic">
 Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
 </floater.string>
+<floater.string
+     name="ErrorFetchingServerReleaseNotesURL">
+Error fetching server release notes URL.
+</floater.string>
   <tab_container
     follows="all" 
     top="25"
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 07cb4c12f5..e5dcc9bcb5 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -834,7 +834,7 @@
              name="Simulator primitive usage:"
              top_pad="4"
              width="364">
-               Primitive usage:
+               Region capacity:
             </text>
             <text
              type="string"
@@ -858,7 +858,7 @@
              name="Primitives parcel supports:"
              top="44"
              width="152">
-                Prims parcel supports:
+                Parcel land capacity:
             </text>
             <text
              type="string"
@@ -882,7 +882,7 @@
              name="Primitives on parcel:"
              top="64"
              width="152">
-                Prims on parcel:
+                Parcel land impact:
             </text>
             <text
              type="string"
@@ -2179,4 +2179,4 @@ Only large parcels can be listed in search.
              </panel>
         </panel>
     </tab_container>
-</floater>
\ No newline at end of file
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_build_options.xml b/indra/newview/skins/default/xui/en/floater_build_options.xml
index afb7917043..c247a12e7a 100644
--- a/indra/newview/skins/default/xui/en/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_build_options.xml
@@ -37,7 +37,7 @@
      layout="topleft"
      left="10"
      tool_tip="Grid opacity"
-     name="grid_mode_label"
+     name="grid_opacity_label"
      top_pad="30"
      width="123">
         Mode
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 1d4a1d4827..2eea286c8b 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="true" height="550" min_height="550" min_width="620"
-     name="Model Preview" title="Upload Model" width="620"
+     can_resize="false" height="480" min_height="480" min_width="940"
+     name="Model Preview" title="Upload Model" width="940"
       help_topic="upload_model" >
 
-  <string name="status_idle">Idle</string>
-  <string name="status_parse_error">Dae parsing issue - see log for details.</string>
+  <string name="status_idle"></string>
+  <string name="status_parse_error">Error: Dae parsing issue - see log for details.</string>
   <string name="status_reading_file">Loading...</string>
   <string name="status_generating_meshes">Generating Meshes...</string>
   <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>
@@ -21,615 +21,1409 @@
   <string name="mesh_status_mesh_mismatch">Levels of detail have a different number of mesh instances.</string>
   <string name="mesh_status_too_many_vertices">Level of detail has too many vertices.</string>
   <string name="mesh_status_missing_lod">Missing required level of detail.</string>
+  <string name="mesh_status_invalid_material_list">LOD materials are not a subset of reference model.</string>
   <string name="layer_all">All</string> <!-- Text to display in physics layer combo box for "all layers" -->
   <string name="decomposing">Analyzing...</string>
   <string name="simplifying">Simplifying...</string>
   <string name="tbd">TBD</string>
-  
-
-  <text left="15" bottom="25" follows="top|left" height="15" name="name_label">
-    Name:
-  </text>
-  <line_editor bottom_delta="20" follows="top|left|right" height="19" max_length_bytes="64" 
-	     name="description_form" prevalidate_callback="ascii" width="290" />
-  
-  <text bottom_delta="20" left="15" follows="left|top" height="15" name="lod_label">
-    Preview:
-  </text>
-  <combo_box bottom_delta="20" follows="left|top" height="18"
-	     name="preview_lod_combo" width="240" tool_tip="LOD to view in preview render">
-    <combo_item name="high">
-      Level of Detail: High
-    </combo_item>
-    <combo_item name="medium">
-      Level of Detail: Medium
-    </combo_item>
-    <combo_item name="low">
-      Level of Detail: Low
-    </combo_item>
-    <combo_item name="lowest">
-      Level of Detail: Lowest
-    </combo_item>
-  </combo_box>
-
-    <menu_button follows="top|left" 
-         image_hover_unselected="Toolbar_Left_Over"
-         image_overlay="OptionsMenu_Off"
-         image_selected="Toolbar_Left_Selected"
-         image_unselected="Toolbar_Left_Off"
-         layout="topleft"
-         left_pad="5"
-         name="options_gear_btn"
-         width="31"
-         height="25"/>
-  <!-- Placeholder panel for 3D preview render -->
-  <panel
-    name="preview_panel"
-    left="15"
-    bevel_style="none"
-    border_style="line"
-    border="true"
-    width="290"
-    height="290"
-    follows="all"/>
-    
-    <text
-     font="SansSerif"
-	 bottom_delta="15"
-     left_delta="0"
-     name="warning_title"
-     text_color="Yellow"
-     visible="false">
-     WARNING:
-    </text>
-    <text
-     text_color="White"
-     height="40"
-	 width="290"
-	 top_delta="15"
-     left_delta="0"
-     name="warning_message"
-     parse_urls="true"
-     wrap="true"
-     visible="false">
-     You will not be able to complete the final upload of this model to the Second Life servers. [[VURL] Find out how] to get enabled for mesh model uploads.</text>
-
-  <text
-	height="65"
-	top_delta="45"
-	left_delta="0"
-	name="weights_text"
-	width="80"
-	word_wrap="true" 
-	>
-Download:
-Physics:
-Server:
-
-Prim equivs:
-  </text>
-
-  <text
-	height="65"
-	top_delta="0"
-	left_delta="80"
-	name="weights"
-	width="70"
-	word_wrap="true" 
-	>
-[ST]
-[PH]
-[SIM]
-
-[EQ]
-  </text>
-
-<!--
-  <text
-	height="65"
-	top_delta="0"
-	left_delta="70"
-	name="price_breakdown_text"
-	width="80"
-	word_wrap="true" 
-	>
-Streaming:
-Physics:
-Instances:
-Textures:
-Model:
-  </text>
-
-  <text
-	height="65"
-	top_delta="0"
-	left_delta="80"
-	name="price_breakdown"
-	width="65"
-	word_wrap="true" 
-	>
-L$ [STREAMING]
-L$ [PHYSICS]
-L$ [INSTANCES]
-L$ [TEXTURES]
-L$ [MODEL]
-  </text>
-    -->
 
-  <tab_container
-    follows="right|top|bottom"
-    top="15"
-    left="310"
-    height="470"
-    width="300"
-    name="import_tab"
-    border="true"
-    tab_position="top">
-
-    <!-- LOD PANEL -->
+<panel
+  follows="top|left"
+  height="455"
+  layout="topleft"
+  left="3"
+  name="left_panel"
+  top_pad="10"
+  width="630">
     <panel
-      border="true"
-      label="Level of Detail"
-      name="lod_panel"
-      help_topic="upload_model_lod">
-
-      <text left="10" width="240" bottom="20" height="15" follows="left|top" name="lod_table_header">
-        Select Level of Detail:
-      </text>
-     
-      <text valign="center" halign="center" bg_visible="true" bottom_delta="16" left="75" width="65" height="18" follows="left|top" value="Triangles"/>
-      <text valign="center" halign="center" bg_visible="true" left_pad="0" width="65" height="18" follows="left|top" value="Vertices"/>
-      <text valign="center" halign="center" left_pad="0" width="65" bg_visible="true" height="18" follows="left|top" value="Status"/>
-      
-      <text valign="center" halign="center" bg_visible="true" name="high_label" left="10" top_pad="0" width="65" height="18" follows="left|top" value="High"/>
-      <text valign="center" halign="center" bg_visible="true" name="high_triangles" left_pad="0" width="65" height="18" follows="left|top" value="0"/>
-      <text valign="center" halign="center" bg_visible="true" name="high_vertices" left_pad="0" width="65" height="18" follows="left|top" value="0"/>
-      <text valign="center" halign="center" bg_visible="true" name="high_status" left_pad="0" width="65" height="18" follows="left|top" value=""/>
-      <icon height="16" width="16" image_name="lag_status_critical.tga" mouse_opaque="true" name="status_icon_high" left_delta="20" top_delta="0" />
-
-      <text valign="center" halign="center" bg_visible="true" name="medium_label" left="10" top_pad="0" width="65" height="18" follows="left|top" value="Medium"/>
-      <text valign="center" halign="center" bg_visible="true" name="medium_triangles" left_pad="0" width="65" height="18" follows="left|top" value="0"/>
-      <text valign="center" halign="center" bg_visible="true" name="medium_vertices" left_pad="0" width="65" height="18" follows="left|top" value="0"/>
-      <text valign="center" halign="center" bg_visible="true" name="medium_status" left_pad="0" width="65" height="18" follows="left|top" value=""/>
-      <icon height="16" width="16" image_name="lag_status_critical.tga" mouse_opaque="true" name="status_icon_medium" left_delta="20" top_delta="0" />
-
-      <text valign="center" halign="center" bg_visible="true" name="low_label" left="10" top_pad="0" width="65" height="18" follows="left|top" value="Low"/>
-      <text valign="center" halign="center" bg_visible="true" name="low_triangles" left_pad="0" width="65" height="18" follows="left|top" value="0"/>
-      <text valign="center" halign="center" bg_visible="true" name="low_vertices" left_pad="0" width="65" height="18" follows="left|top" value="0"/>
-      <text valign="center" halign="center" bg_visible="true" name="low_status" left_pad="0" width="65" height="18" follows="left|top" value=""/>
-      <icon height="16" width="16" image_name="lag_status_critical.tga" mouse_opaque="true" name="status_icon_low" left_delta="20" top_delta="0" />
-
-      <text valign="center" halign="center" bg_visible="true" name="lowest_label" left="10" top_pad="0" width="65" height="18" follows="left|top" value="Lowest"/>
-      <text valign="center" halign="center" bg_visible="true" name="lowest_triangles" left_pad="0" width="65" height="18" follows="left|top" value="0"/>
-      <text valign="center" halign="center" bg_visible="true" name="lowest_vertices" left_pad="0" width="65" height="18" follows="left|top" value="0"/>
-      <text valign="center" halign="center" bg_visible="true" name="lowest_status" left_pad="0" width="65" height="18" follows="left|top" value=""/>
-      <icon height="16" width="16" image_name="lag_status_critical.tga" mouse_opaque="true" name="status_icon_lowest" left_delta="20" top_delta="0" />
-      
-      <text left="10" width="240" height="15" top_pad="15" follows="left|top" name="lod_table_footer">
-        Level of Detail: [DETAIL]
-      </text>
-
-      <icon height="16" width="16" left="20" follows="left|top" name="lod_status_message_icon"/>
-      <text left_pad="5" width="200" height="28" follows="left|top" top_pad="-15" wrap="true" name="lod_status_message_text"/>
-
-      <text top_pad="-3" left="10" height="15" follows="left|top">
-        Mesh
-      </text>
-
-      <radio_group follows="top|left" height="210" left="30" name="lod_file_or_limit" width="240" value="lod_from_file">
-        <radio_item bottom="195" label="Load from file" name="lod_from_file"/>
-        <radio_item bottom="150" label="Auto generate" name="lod_auto_generate"/>
-        <radio_item bottom="0" label="None" name="lod_none"/>
-      </radio_group>
-
-      <line_editor follows="left|top" bottom_delta="-170" width="140" left="45" value="" name="lod_file" height="20"/>
-      <button bottom_delta="3" name="lod_browse" label="Browse..." left_pad="5" follows="left|top" width="70" height="25"/>
-
-      <combo_box follows="top|left" name="lod_mode" top_pad="22" width="100" left="45" height="20">
-        <combo_item name="triangle_limit">
-          Triangle Limit
-        </combo_item>
-        <combo_item name="error_threshold">
-          Error Threshold
-        </combo_item>
-      </combo_box>
-      <spinner follows="top|left" name="lod_triangle_limit" increment="10" left_pad="5" height="20" width="100" decimal_digits="0" enabled="true"/>
-      <spinner left_delta="0" bottom_delta="0" increment="0.01"  follows="top|left" name="lod_error_threshold" min_val="0" max_val="100" height="20" width="100" decimal_digits="3" visible="false" enabled="true"/>
-
-      <text follows="top|left" name="build_operator_text" left="45" top_pad="10" width="100" height="15">
-        Build Operator:  
-      </text>
-      <text follows="top|left" name="queue_mode_text" left_pad="5" width="100" height="15">
-        Queue Mode:
-      </text>
-      <combo_box follows="top|left" name="build_operator" top_pad="5" left="45" width="100" height="20">
-        <combo_item name="edge_collapse">
-          Edge Collapse
-        </combo_item>
-        <combo_item name="half_edge_collapse">
-          Half Edge Collapse
-        </combo_item>
-      </combo_box>
-
-      <combo_box follows="top|left" name="queue_mode" left_pad="5" width="100" height="20">
-        <combo_item name="greedy">
-          Greedy
-        </combo_item>
-        <combo_item name="lazy">
-          Lazy
-        </combo_item>
-        <combo_item name="independent">
-          Independent
-        </combo_item>
-      </combo_box>
-
-      <text top_pad="10" name="border_mode_text" left="45" follows="left|top" width="100" height="15">
-        Border Mode:
-      </text>
-
-      <text left_pad="5" name="share_tolderance_text"  follows="left|top" width="100" height="15">
-        Share Tolerance:
-      </text>
-
-      <combo_box follows="left|top" left="45" height="20" name="border_mode" width="100">
-        <combo_item name="border_unlock">
-          Unlock
-        </combo_item>
-        <combo_item name="border_lock">
-          Lock
-        </combo_item>
-      </combo_box>
-      <spinner follows="left|top" name="share_tolerance" left_pad="5" width="100" decimal_digits="5" initial_value="0.00001" height="20"/>
-             
-      <text left="10" top_pad="35" follows="top|left" width="240" height="15">
-        Generate Normals
-      </text>
-      <text left="35" top_pad="5" follows="top|left" width="100" height="15" name="crease_label">
-        Crease Angle:
-      </text>
-      <spinner follows="top|left" left_pad="5" min_val="0" max_val="180" value="75" width="60" height="20" name="crease_angle"/>  
-    </panel>
-
-    <!--  PANEL -->
-    <panel
-      border="true"
-      label="Physics"
-      name="physics_panel"
-      help_topic="upload_model_physics">
-
-      <!-- PHYSICS GEOMETRY-->
-      <panel
-        follows="top|left"
-        name="physics geometry"
-        left="0"
-        top="0"
-        width="300"
-        height="65"
-        visible="true"
-        border="true"
-        bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
-
-        <radio_group follows="top|left" top="10" width="240" height="40" name="physics_load_radio" value="physics_load_from_file">
-          <radio_item bottom="0" name="physics_load_from_file" label="File:"/>
-          <radio_item bottom="23" name="physics_use_lod" label="Use Level of Detail:"/>
-        </radio_group>
-
-        <combo_box left="180" top="10" follows="left|top" height="18"
-	        name="physics_lod_combo" width="110" tool_tip="LOD to use for physics shape">
-          <combo_item name="physics_lowest">
-            Lowest
-          </combo_item>
-          <combo_item name="physics_low">
-            Low
-          </combo_item>
-          <combo_item name="physics_medium">
-            Medium
-          </combo_item>
-          <combo_item name="physics_high">
-            High
-          </combo_item>
-        </combo_box>
-
-        <line_editor follows="left|top" top_pad="5" width="140" left="60" value="" name="physics_file" height="20"/>
-        <button left_pad="10" name="physics_browse" label="Browse..." follows="left|top" width="70" height="20"/>
-
-        <!--
-        <check_box name="physics_optimize" follows="left|top" width="130" left="10" top_pad="5" height="20" label="Optimize"/>
-        <check_box name="physics_use_hull" follows="left|top" width="130" left_pad="5" height="20" label="Use Convex Hull"/>
-        -->
-     </panel>
-
-
-      <!-- PHYSICS ANALYSIS-->
-      <panel
-       follows="top|left"
-       name="physics analysis"
-       top_pad="0"
-       left="0"
-       width="300"
-       height="130"
-       visible="true"
-       border="true"
-       bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
-
-        <text follows="left|top" bottom="40" height="30" left="10" font="SansSerifBig">
-          Step 1: Analysis
+      follows="all"
+      height="50"
+      layout="top|left"
+      left="3"
+      name="model_name_representation_panel"
+      width="525">
+        <text
+          follows="top|left"
+          layout="topleft"
+          height="15"
+          left="15"
+          name="name_label"
+          text_color="White"
+          top="0"
+          width="290">
+          Model name:
         </text>
-        
-        <text top_pad="5" width="50" follows="top|left" height="15">
-          Method:
+        <line_editor
+          follows="top|left"
+          layout="topleft"
+          height="19"
+          max_length_bytes="64"
+          name="description_form"
+          prevalidate_callback="ascii"
+          top_pad="5"
+          width="290" />
+        <text
+          follows="left|top"
+          height="15"
+          layout="topleft"
+          left_pad="15"
+          name="model_category_label"
+          text_color="White"
+          top="0"
+          width="200">
+          This model represents...
         </text>
-        <combo_box name="Method" follows="top|left" left_pad="5" bottom_delta="2" height="20" width="80"/>
-        <text left="160" bottom_delta="-2" width="50" follows="top|left" height="15">
-          Quality:
-        </text>
-        <combo_box name="Decompose Quality" bottom_delta="2" follows="top|left" left_pad="5" height="20" width="80"/>
-
-        <slider name="Smooth" left="10" width="280" follows="top|left" top_pad="10" height="20" label="Smooth:"/>
-
-        <check_box name="Close Holes (Slow)" follows="top|left" top_pad="10" height="15" label="Close Holes (slow)"/>
-                
-        <button left="200" bottom_delta="0" width="90" follows="top|left" label="Analyze" name="Decompose" height="20"/>
-        <button left="200" bottom_delta="0" width="90" follows="top|left" label="Cancel" name="decompose_cancel" visble="false" height="20"/>
-      </panel>
-      
-
-      <!-- PHYSICS SIMPLIFICATION -->
-     <panel
-       follows="top|left"
-       name="physics simplification"
-       left="0"
-       top_pad="0"
-       width="300"
-       height="150"
-       visible="true"
-       border="true"
-       bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
-
-        <text follows="left|top" bottom="40" height="30" left="10" font="SansSerifBig">
-          Step 2: Simplification
-        </text>
-
-        <text left="10" top_pad="5" height="15" width="140" follows="top|left">
-          Method:
-        </text>
-        
-        <combo_box left_pad="5" height="20" width="120" follows="top|left" name="Simplify Method"/>
-
-        <slider left="10" name="Combine Quality" label="Passes:" label_width="120" width="270" follows="top|left" top_pad="10" height="20"/>
-        <slider name="Detail Scale" label="Detail Scale:" label_width="120" width="270" follows="top|left" top_pad="10" height="20"/>
-        <slider name="Retain%" label="Retain:" label_width="120" width="270" follows="top|left" bottom_delta="0" left_delta="0" visible="false" height="20"/>
-        <button left="190" width="90" follows="top|left" label="Simplify" name="Simplify" height="20"/>
-        <button left="190" bottom_delta="0" width="90" follows="top|left" label="Cancel" name="simplify_cancel" height="20"/>
-        
-      </panel>
-
-      <!-- INFO PANEL -->
-      <panel
-        left="0"
-        top_pad="0"
-        width="300"
-        height="100"
-        follows="left|top"
-        name="physics info"
-        visible="true"
-        border="true" 
-        bevel_style="none" bg_alpha_color="0 0 0 0" bg_opaque_color="0 0 0 0.3">
-
-        <slider name="physics_explode" follows="top|left" top="10" left="10" label="Preview Spread:" min_val="0.0" max_val="3.0" height="20" width="280"/>
-        
-        <text follows="top|left" name="physics_triangles" top_pad="10" height="15" left="10">
-          Triangles: [TRIANGLES]
-        </text>
-        <text follows="top|left" name="physics_points" top_pad="5" height="15">
-          Vertices: [POINTS]
-        </text>
-        <text follows="top|left" name="physics_hulls" top_pad="5" height="15">
-          Hulls: [HULLS]
-        </text>
-
-
-      </panel>
+        <combo_box
+          follows="left|top"
+          height="23"
+          left_pad="10"
+          name="model_category_combo"
+          top_pad="10"
+          width="200">
+        <combo_box.drop_down_button
+          label_color="White"/>
+          <combo_item name="Choose one" label="Choose One..." value="MUT_Unspecified"/>
+          <combo_item name="Avatar shape" label="Avatar shape" value="MUT_AvatarShape"/>
+          <combo_item name="Avatar attachment" label="Avatar attachment" value="MUT_AvatarAttachment"/>
+          <combo_item name="Moving object (vehicle, animal)" label="Moving object (vehicle, animal)" value="MUT_MovingObject"/>
+          <combo_item name="Building Component" label="Building Component" value="MUT_BuildingComponent"/>
+          <combo_item name="Large, non moving etc" label="Large, non moving etc" value="MUT_LargeStationary"/>
+          <combo_item name="Smaller, non-moving etc" label="Smaller, non-moving etc" value="MUT_SmallStationary"/>
+          <combo_item name="Not really any of these" label="Not really any of these" value="MUT_Other"/>
+         </combo_box>
     </panel>
-
-    <!-- MODIFIERS PANEL -->
+    <tab_container
+      follows="top|left"
+      top_pad="15"
+      left="0"
+      height="300"
+      width="625"
+      name="import_tab"
+      tab_position="top">
+      <!-- LOD PANEL -->
+        <panel
+         help_topic="upload_model_lod"
+         label="Level of Detail"
+         layout="topleft"
+         name="lod_panel"
+         title="Level of Detail">
+            <view_border
+             bevel_style="none"
+             follows="top|left"
+             height="275"
+             layout="topleft"
+             left="3"
+             name="lod_tab_border"
+             top_pad="0"
+             width="619" />
+            <text
+             follows="left|top"
+             height="18"
+             initial_value="Source"
+             layout="topleft"
+             left="75"
+             name="source"
+             text_color="ModelUploaderLabels"
+             top="15"
+             valign="center"
+             value="Source"
+             width="335" />
+            <text
+             follows="left|top"
+             halign="right"
+             height="18"
+             initial_value="Triangles"
+             layout="topleft"
+             left_pad="0"
+             name="triangles"
+             text_color="ModelUploaderLabels"
+             top_delta="0"
+             valign="center"
+             value="Triangles"
+             width="65" />
+            <text
+             follows="left|top"
+             halign="right"
+             height="18"
+             initial_value="Vertices"
+             layout="topleft"
+             left_pad="0"
+             name="vertices"
+             text_color="ModelUploaderLabels"
+             valign="center"
+             value="Vertices"
+             width="65" />
+            <text
+             follows="left|top"
+             height="18"
+             initial_value="High"
+             layout="topleft"
+             left="10"
+             name="high_label"
+             text_color="ModelUploaderLabels"
+             top_pad="10"
+             valign="center"
+             value="High"
+             width="65" />
+            <combo_box
+             follows="top|left"
+             height="20"
+             layout="topleft"
+             left_pad="0"
+             name="lod_source_high"
+             top_delta="-3"
+             width="135">
+                <item
+                 id="Load from file"
+                 value="Load from file" />
+                <item
+                 id="Generate"
+                 value="Generate" />
+            </combo_box>
+            <line_editor
+             follows="left|top"
+             height="20"
+             initial_value=""
+             layout="topleft"
+             left_pad="5"
+             name="lod_file_high"
+             top_delta="0"
+             value=""
+             width="120" />
+            <button
+             follows="left|top"
+             height="20"
+             label="Browse..."
+             layout="topleft"
+             left_pad="5"
+             name="lod_browse_high"
+             top_delta="0"
+             width="70" />
+            <combo_box
+             follows="top|left"
+             height="20"
+             layout="topleft"
+             left="215"
+             name="lod_mode_high"
+             top_delta="0"
+             visible="false"
+             width="135">
+                <item
+                 id="Triangle Limit"
+                 value="Triangle Limit" />
+                <item
+                 id="Error Threshold"
+                 value="Error Threshold" />
+            </combo_box>
+            <spinner
+             decimal_digits="0"
+             follows="top|left"
+             height="20"
+             increment="10"
+             layout="topleft"
+             left_pad="5"
+             name="lod_triangle_limit_high"
+             visible="false"
+             width="55" />
+            <spinner
+             follows="top|left"
+             height="20"
+             increment="0.01"
+             layout="topleft"
+             left_delta="0"
+             max_val="100"
+             name="lod_error_threshold_high"
+             top_delta="0"
+             visible="false"
+             width="55" />
+            <text
+             follows="left|top"
+             halign="right"
+             height="18"
+             initial_value="0"
+             layout="topleft"
+             left_pad="0"
+             name="high_triangles"
+             valign="center"
+             value="0"
+             width="65" />
+            <text
+             follows="left|top"
+             halign="right"
+             height="18"
+             initial_value="0"
+             layout="topleft"
+             left_pad="0"
+             name="high_vertices"
+             valign="center"
+             value="0"
+             width="65" />
+            <text
+             follows="left|top"
+             halign="center"
+             height="18"
+             initial_value=""
+             layout="topleft"
+             left_pad="0"
+             name="high_status"
+             valign="center"
+             value=""
+             width="65" />
+            <icon
+             height="16"
+             image_name="red_x.png"
+             layout="topleft"
+             left_delta="20"
+             mouse_opaque="true"
+             name="status_icon_high"
+             top_delta="0"
+             width="16" />
+            <text
+             follows="left|top"
+             height="18"
+             initial_value="Medium"
+             layout="topleft"
+             left="10"
+             name="medium_label"
+             text_color="ModelUploaderLabels"
+             top_pad="15"
+             valign="center"
+             value="Medium"
+             width="65" />
+            <combo_box
+             follows="top|left"
+             height="20"
+             layout="topleft"
+             left_pad="0"
+             name="lod_source_medium"
+             top_delta="-3"
+             width="135">
+                <item
+                 id="Load from file"
+                 value="Load from file" />
+                <item
+                 id="Generate"
+                 value="Generate" />
+                <item
+                 id="Use LoD above"
+                 value="Use LoD above" />
+            </combo_box>
+            <line_editor
+             follows="left|top"
+             height="20"
+             initial_value=""
+             layout="topleft"
+             left_pad="5"
+             name="lod_file_medium"
+             top_delta="0"
+             value=""
+             visible="false"
+             width="120" />
+            <button
+             follows="left|top"
+             height="20"
+             label="Browse..."
+             layout="topleft"
+             left_pad="5"
+             name="lod_browse_medium"
+             top_delta="0"
+             visible="false"
+             width="70" />
+            <combo_box
+             follows="top|left"
+             height="20"
+             layout="topleft"
+             left="215"
+             name="lod_mode_medium"
+             top_delta="0"
+             width="135">
+                <item
+                 id="Triangle Limit"
+                 value="Triangle Limit" />
+                <item
+                 id="Error Threshold"
+                 value="Error Threshold" />
+            </combo_box>
+            <spinner
+             decimal_digits="0"
+             follows="top|left"
+             height="20"
+             increment="10"
+             layout="topleft"
+             left_pad="5"
+             name="lod_triangle_limit_medium"
+             width="55" />
+            <spinner
+             follows="top|left"
+             height="20"
+             increment="0.01"
+             layout="topleft"
+             left_delta="0"
+             max_val="100"
+             name="lod_error_threshold_medium"
+             top_delta="0"
+             visible="false"
+             width="55" />
+            <text
+             follows="left|top"
+             halign="right"
+             height="18"
+             initial_value="0"
+             layout="topleft"
+             left_pad="0"
+             name="medium_triangles"
+             valign="center"
+             value="0"
+             width="65" />
+            <text
+             follows="left|top"
+             halign="right"
+             height="18"
+             initial_value="0"
+             layout="topleft"
+             left_pad="0"
+             name="medium_vertices"
+             valign="center"
+             value="0"
+             width="65" />
+            <text
+             follows="left|top"
+             halign="center"
+             height="18"
+             initial_value=""
+             layout="topleft"
+             left_pad="0"
+             name="medium_status"
+             valign="center"
+             value=""
+             width="65" />
+            <icon
+             height="16"
+             image_name="red_x.png"
+             layout="topleft"
+             left_delta="20"
+             mouse_opaque="true"
+             name="status_icon_medium"
+             top_delta="0"
+             width="16" />
+            <text
+             follows="left|top"
+             height="18"
+             initial_value="Low"
+             layout="topleft"
+             left="10"
+             name="low_label"
+             text_color="ModelUploaderLabels"
+             top_pad="15"
+             valign="center"
+             value="Low"
+             width="65" />
+            <combo_box
+             follows="top|left"
+             height="20"
+             layout="topleft"
+             left_pad="0"
+             name="lod_source_low"
+             top_delta="-3"
+             width="135">
+                <item
+                 id="Load from file"
+                 value="Load from file" />
+                <item
+                 id="Generate"
+                 value="Generate" />
+                <item
+                 id="Use LoD above"
+                 value="Use LoD above" />
+            </combo_box>
+            <line_editor
+             follows="left|top"
+             height="20"
+             initial_value=""
+             layout="topleft"
+             left_pad="5"
+             name="lod_file_low"
+             top_delta="0"
+             value=""
+             visible="false"
+             width="120" />
+            <button
+             follows="left|top"
+             height="20"
+             label="Browse..."
+             layout="topleft"
+             left_pad="5"
+             name="lod_browse_low"
+             top_delta="0"
+             visible="false"
+             width="70" />
+            <combo_box
+             follows="top|left"
+             height="20"
+             layout="topleft"
+             left="215"
+             name="lod_mode_low"
+             top_delta="0"
+             width="135">
+                <item
+                 id="Triangle Limit"
+                 value="Triangle Limit" />
+                <item
+                 id="Error Threshold"
+                 value="Error Threshold" />
+            </combo_box>
+            <spinner
+             decimal_digits="0"
+             follows="top|left"
+             height="20"
+             increment="10"
+             layout="topleft"
+             left_pad="5"
+             name="lod_triangle_limit_low"
+             width="55" />
+            <spinner
+             follows="top|left"
+             height="20"
+             increment="0.01"
+             layout="topleft"
+             left_delta="0"
+             max_val="100"
+             name="lod_error_threshold_low"
+             top_delta="0"
+             visible="false"
+             width="55" />
+            <text
+             follows="left|top"
+             halign="right"
+             height="18"
+             initial_value="0"
+             layout="topleft"
+             left_pad="0"
+             name="low_triangles"
+             valign="center"
+             value="0"
+             width="65" />
+            <text
+             follows="left|top"
+             halign="right"
+             height="18"
+             initial_value="0"
+             layout="topleft"
+             left_pad="0"
+             name="low_vertices"
+             valign="center"
+             value="0"
+             width="65" />
+            <text
+             follows="left|top"
+             halign="center"
+             height="18"
+             initial_value=""
+             layout="topleft"
+             left_pad="0"
+             name="low_status"
+             valign="center"
+             value=""
+             width="65" />
+            <icon
+             height="16"
+             image_name="red_x.png"
+             layout="topleft"
+             left_delta="20"
+             mouse_opaque="true"
+             name="status_icon_low"
+             top_delta="0"
+             width="16" />
+            <text
+             follows="left|top"
+             height="18"
+             initial_value="Lowest"
+             layout="topleft"
+             left="10"
+             name="lowest_label"
+             text_color="ModelUploaderLabels"
+             top_pad="15"
+             valign="center"
+             value="Lowest"
+             width="65" />
+            <combo_box
+             follows="top|left"
+             height="20"
+             layout="topleft"
+             left_pad="0"
+             name="lod_source_lowest"
+             top_delta="-3"
+             width="135">
+                <item
+                 id="Load from file"
+                 value="Load from file" />
+                <item
+                 id="Generate"
+                 value="Generate" />
+                <item
+                 id="Use LoD above"
+                 value="Use LoD above" />
+            </combo_box>
+            <line_editor
+             follows="left|top"
+             height="20"
+             initial_value=""
+             layout="topleft"
+             left_pad="5"
+             name="lod_file_lowest"
+             top_delta="0"
+             value=""
+             visible="false"
+             width="120" />
+            <button
+             follows="left|top"
+             height="20"
+             label="Browse..."
+             layout="topleft"
+             left_pad="5"
+             name="lod_browse_lowest"
+             top_delta="0"
+             visible="false"
+             width="70" />
+            <combo_box
+             follows="top|left"
+             height="20"
+             layout="topleft"
+             left="215"
+             name="lod_mode_lowest"
+             top_delta="0"
+             width="135">
+                <item
+                 id="Triangle Limit"
+                 value="Triangle Limit" />
+                <item
+                 id="Error Threshold"
+                 value="Error Threshold" />
+            </combo_box>
+            <spinner
+             decimal_digits="0"
+             follows="top|left"
+             height="20"
+             increment="10"
+             layout="topleft"
+             left_pad="5"
+             name="lod_triangle_limit_lowest"
+             width="55" />
+            <spinner
+             follows="top|left"
+             height="20"
+             increment="0.01"
+             layout="topleft"
+             left_delta="0"
+             max_val="100"
+             name="lod_error_threshold_lowest"
+             top_delta="0"
+             visible="false"
+             width="55" />
+            <text
+             follows="left|top"
+             halign="right"
+             height="18"
+             initial_value="0"
+             layout="topleft"
+             left_pad="0"
+             name="lowest_triangles"
+             valign="center"
+             value="0"
+             width="65" />
+            <text
+             follows="left|top"
+             halign="right"
+             height="18"
+             initial_value="0"
+             layout="topleft"
+             left_pad="0"
+             name="lowest_vertices"
+             valign="center"
+             value="0"
+             width="65" />
+            <text
+             follows="left|top"
+             halign="center"
+             height="18"
+             initial_value=""
+             layout="topleft"
+             left_pad="0"
+             name="lowest_status"
+             valign="center"
+             value=""
+             width="65" />
+            <icon
+             height="16"
+             image_name="red_x.png"
+             layout="topleft"
+             left_delta="20"
+             mouse_opaque="true"
+             name="status_icon_lowest"
+             top_delta="0"
+             width="16" />
+            <icon
+             height="16"
+             layout="topleft"
+             left="10"
+             name="lod_status_message_icon"
+             top_pad="20"
+             width="16" />
+            <text
+             follows="left|top"
+             height="16"
+             layout="topleft"
+             left_pad="5"
+             name="lod_status_message_text"
+             top_delta="0"
+             width="584"
+             word_wrap="true"
+             wrap="true" />
+            <view_border
+             bevel_style="none"
+             follows="top|left"
+             height="0"
+             layout="topleft"
+             left="10"
+             name="lod_tab_border"
+             top_pad="20"
+             width="605" />
+            <check_box
+             follows="top|left"
+             height="15"
+             label="Generate Normals"
+             layout="topleft"
+             left="10"
+             name="gen_normals"
+             top_pad="20" />
+            <text
+             enabled="false"
+             follows="top|left"
+             height="15"
+             initial_value="Crease Angle:"
+             layout="topleft"
+             left="200"
+             name="crease_label"
+             top_delta="0"
+             value="Crease Angle:"
+             width="100" />
+            <spinner
+             enabled="false"
+             follows="top|left"
+             height="20"
+             initial_value="75"
+             layout="topleft"
+             left_pad="5"
+             max_val="180"
+             name="crease_angle"
+             value="75"
+             width="60" />
+        </panel>
+      <!-- PHYSYCS PANEL -->
+        <panel
+          help_topic="upload_model_physics"
+          label="Physics"
+          name="physics_panel">
+            
+            <!-- ==== STEP 1: Level of Detail ==== -->
+            <view_border
+              bevel_style="none"
+              follows="top|left"
+              height="275"
+              layout="topleft"
+              left="3"
+              name="physics_tab_border"
+              top_pad="0"
+              width="619"/>
+                <panel
+                  bg_alpha_color="0 0 0 0"
+                  bg_opaque_color="0 0 0 0.3"
+                  follows="top|left"
+                  height="21"
+                  left="18"
+                  name="physics geometry"
+                  top="15"
+                  visible="true"
+                  width="589">
+                    <text
+                      follows="top|left"
+                      font="SansSerif"
+                      height="20"
+                      layout="topleft"
+                      left="0"
+                      name="first_step_name"
+                      text_color="White"
+                      top_pad="0"
+                      width="210">
+                      Step 1: Level of Detail
+                    </text>
+                    <combo_box
+                      follows="left|top"
+                      height="18"
+                      left_pad="10"
+                      name="physics_lod_combo"
+                      width="130"
+                      tool_tip="LOD to use for physics shape">
+                        <combo_item name="choose_one">     Choose one...   </combo_item>
+                        <combo_item name="physics_high">   High   </combo_item>
+                        <combo_item name="physics_medium"> Medium </combo_item>
+                        <combo_item name="physics_low">    Low    </combo_item>
+                        <combo_item name="physics_lowest"> Lowest </combo_item>
+                        <combo_item name="load_from_file"> From file   </combo_item>
+                    </combo_box>
+                    <line_editor
+                      follows="left|top"
+                      left_pad="10"
+                      value=""
+                      name="physics_file"
+                      height="20"
+                      width="154"/>
+                    <button
+                      follows="left|top"
+                      height="20"
+                      left_pad="4"
+                      name="physics_browse"
+                      label="Browse..."
+                      width="70"/>
+                    <!-- <check_box name="physics_optimize" follows="left|top" width="130" left="10" top_pad="5" height="20" label="Optimize"/>
+                    <check_box name="physics_use_hull" follows="left|top" width="130" left_pad="5" height="20" label="Use Convex Hull"/> -->
+                </panel>
+            
+            <!-- ==== STEP 2: Analyse ==== -->
+            <view_border
+              bevel_style="none"
+              follows="top|left"
+              height="0"
+              layout="topleft"
+              left="18"
+              name="physics_tab_border"
+              top_pad="15"
+              width="589"/>
+                <panel
+                  bg_alpha_color="0 0 0 0"
+                  bg_opaque_color="0 0 0 0.3"
+                  height="65"
+                  follows="top|left"
+                  left="18"
+                  name="physics analysis"
+                  top_pad="15"
+                  visible="true"
+                  width="589">
+                    <text
+                      follows="left|top"
+                      font="SansSerif"
+                      height="20"
+                      layout="topleft"
+                      left="0"
+                      name="method_label"
+                      text_color="White"
+                      top_pad="0">
+                      Step 2: Analyse
+                    </text>
+                    <text
+                      follows="top|left"
+                      height="15"
+                      layout="topleft"
+                      name="analysis_method_label"
+                      top_pad="10"
+                      width="100">
+                      Method:
+                    </text>
+                    <text
+                      follows="top|left"
+                      height="15"
+                      name="quality_label"
+                      layout="topleft"
+                      left_pad="15"
+                      width="100">
+                      Quality:
+                    </text>
+                    <text
+                      follows="top|left"
+                      height="15"
+                      name="smooth_method_label"
+                      layout="topleft"
+                      left_pad="15"
+                      width="100">
+                      Smooth:
+                    </text>
+                    <combo_box
+                      follows="top|left"
+                      layout="topleft"
+                      left="0"
+                      name="Method"
+                      top_pad="0"
+                      height="20"
+                      width="100"/>
+                    <combo_box
+                      follows="top|left"
+                      layout="topleft"
+                      left_pad="15"
+                      name="Decompose Quality"
+                      height="20"
+                      width="100"/>
+                    <combo_box
+                      height="20"
+                      follows="top|left"
+                      layout="topleft"
+                      left_pad="15"
+                      name="Cosine%"
+                      width="100"/>
+                    <check_box
+                      follows="top|left"
+                      label="Close Holes"
+                      layout="topleft"
+                      left_pad="10"
+                      name="Close Holes (Slow)"
+                      height="15"/>
+                    <button
+                      bottom="1"
+                      follows="top|right"
+                      height="20"
+                      label="Analyze"
+                      layout="bottomleft"
+                      name="Decompose"
+                      right="-1"
+                      width="90"/>
+                    <button
+                      follows="top|left"
+                      height="20"
+                      label="Cancel"
+                      layout="topleft"
+                      left_delta="0"
+                      name="decompose_cancel"
+                      visible="false"
+                      width="90"/>
+                </panel>
+            
+            <!-- ==== STEP 3: Simplify ==== -->
+            <view_border
+              bevel_style="none"
+              follows="top|left"
+              height="0"
+              layout="topleft"
+              left="18"
+              name="physics_tab_border"
+              top_pad="15"
+              width="589"/>
+                <panel
+                  bg_alpha_color="0 0 0 0"
+                  bg_opaque_color="0 0 0 0.3"
+                  follows="top|left"
+                  height="66"
+                  left="18"
+                  name="physics simplification"
+                  top_pad="15"
+                  width="589">
+                    <text
+                      text_color="White"
+                      follows="left|top"
+                      height="20"
+                      left="0"
+                      name="second_step_label"
+                      top_pad="0"
+                      font="SansSerif">
+                      Step 3: Simplify
+                    </text>
+                    <text
+                      name="simp_method_header"
+                      top_pad="10"
+                      height="15"
+                      width="100"
+                      follows="top|left">
+                      Method:
+                    </text>
+                    <text
+                      follows="top|left"
+                      left_pad="40"
+                      name="pass_method_header"
+                      height="15"
+                      width="41">
+                      Passes:
+                    </text>
+                    <text
+                      follows="top|left"
+                      left_pad="40"
+                      name="Detail Scale label"
+                      height="15"
+                      width="80">
+                      Detail scale:
+                    </text>
+                    <text
+                      follows="top|left"
+                      left_delta="0"
+                      name="Retain%_label"
+                      height="15"
+                      width="80"
+                      visible="false">
+                      Retain:
+                    </text>
+                    <combo_box
+                      follows="top|left"
+                      height="20"
+                      left="0"
+                      name="Simplify Method"
+                      top_pad="0"
+                      width="100"/>
+                    <combo_box
+                      height="20"
+                      follows="top|left"
+                      left_pad="40"
+                      name="Combine Quality"
+                      width="41"
+                      value="1">
+                    </combo_box>
+                    <spinner
+                      follows="top|left"
+                      name="Detail Scale"
+                      height="20"
+                      left_pad="40"
+                      width="60"/>
+                    <spinner
+                      name="Retain%"
+                      decimal_digits="0"
+                      width="60"
+                      follows="top|left"
+                      height="20"
+                      left_delta="0"
+                      visible="false"/>
+                    <button
+                      follows="top|left"
+                      height="20"
+                      label="Simplify"
+                      left_pad="40"
+                      name="Simplify"
+                      width="90"/>
+                    <button
+                      follows="top|left"
+                      height="20"
+                      label="Cancel"
+                      layout="topleft"
+                      left_delta="0"
+                      name="simplify_cancel"
+                      width="90"/>
+                </panel>
+            
+            <!-- ==== Results ==== -->
+            <view_border
+              bevel_style="none"
+              follows="top|left"
+              height="0"
+              layout="topleft"
+              left="18"
+              name="physics_tab_border"
+              top_pad="15"
+              width="589"/>
+                <panel
+                  bg_alpha_color="0 0 0 0"
+                  bg_opaque_color="0 0 0 0.3"
+                  follows="left|top"
+                  height="16"
+                  layout="topleft"
+                  left="18"
+                  name="physics info"
+                  top_pad="15"
+                  width="589">
+                    <text
+                      follows="top|left"
+                      height="15"
+                      layout="topleft"
+                      left="0"
+                      text_color="White"
+                      top_pad="0"
+                      name="results_text"
+                      width="50">
+                      Results:
+                    </text>
+                    <text
+                      follows="top|left"
+                      height="15"
+                      layout="topleft"
+                      left_pad="0"
+                      text_color="White"
+                      top_delta="0"
+                      name="physics_triangles"
+                      width="90">
+                      Triangles: [TRIANGLES],
+                    </text>
+                    <text
+                      follows="top|left"
+                      height="15"
+                      layout="topleft"
+                      left_pad="0"
+                      name="physics_points"
+                      top_delta="0"
+                      text_color="White"
+                      width="85">
+                      Vertices: [POINTS],
+                    </text>
+                    <text
+                      follows="top|left"
+                      height="15"
+                      layout="topleft"
+                      left_pad="0"
+                      name="physics_hulls"
+                      top_delta="0"
+                      text_color="White">
+                      Hulls: [HULLS]
+                    </text>
+                </panel>
+        </panel>
+      <!-- MODIFIERS PANEL -->
+     <panel
+       label="Upload options"
+       name="modifiers_panel"
+       help_topic="upload_model_modifiers">
+         <view_border
+          bevel_style="none"  
+          follows="top|left"
+          height="275"
+          layout="topleft"
+          left="3"
+          name="border"
+          top_pad="0"
+          width="619"/>
+           <text
+             follows="top|left"
+             height="16"
+             left="20"
+             name="scale_label"
+             text_color="White"
+             top="15"
+             width="140">
+             Scale (1=no scaling):
+           </text>
+           <spinner
+             height="20"
+             follows="top|left"
+             left_pad="10"
+             max_val="64.0"
+             min_val="0.01"
+             name="import_scale"
+             top_delta="-4"
+             value="1.0"
+             width="80"/>
+           <text
+             follows="top|left"
+             height="15"
+             left_pad="20"
+             name="dimensions_label"
+             text_color="White"
+             width="90">
+             Dimensions:
+           </text>
+           <text
+             follows="top|left"
+             height="15"
+             left_pad="0"
+             name="import_dimensions"
+             text_color="White"
+             width="140">
+             [X] X [Y] X [Z]
+           </text>
+           <check_box
+             height="15"
+             follows="top|left"
+             name="upload_textures"
+             label="Include textures"
+             label_text.text_color="White"
+             left="20"
+             top_pad="20"/>
+           <view_border
+             bevel_style="none"
+             follows="top|left"
+             height="0"
+             layout="topleft"
+             name="border"
+             top_pad="20"
+             width="579"/>
+           <text
+             follows="top|left"
+             height="15"
+             left="20"
+             name="include_label"
+             text_color="White"
+             top_pad="20"
+             width="150">
+             For avatar models only:
+           </text>
+           <check_box
+             follows="top|left"
+             height="15"
+             label="Include skin weight"
+             label_text.text_color="White"
+             name="upload_skin"
+             top_pad="15"/>
+           <check_box
+             follows="top|left"
+             height="15"
+             label="Include joint positions"
+             label_text.text_color="White"
+             name="upload_joints"
+             top_pad="15"/>
+           <text
+             follows="top|left"
+             height="15"
+             layout="topleft"
+             left="220"
+             name="pelvis_offset_label"
+             text_color="White"
+             top="134"
+             width="200">
+             Z offset (raise or lower avatar):
+           </text>
+           <spinner
+             follows="top|left"
+             height="20"
+             min_val="-3.00"
+             max_val="3.0"
+             name="pelvis_offset"
+             top_pad="10"
+             value="0.0"
+             width="80"/>
+     </panel>
+    </tab_container>
     <panel
-      border="true"
-      label="Modifiers"
-      name="modifiers_panel"
-      help_topic="upload_model_modifiers">
-
-      <text left="10" width="90" bottom="30" follows="top|left" height="15">
-        Scale:
-      </text>
-      <text left_pad="5" width="140" follows="top|left" height="15">
-        Dimensions:
-      </text>
-
-      <spinner left="10" height="20" follows="top|left" width="80" top_pad="5" value="1.0" min_val="0.01" max_val="64.0" name="import_scale"/>
-
-      <text left_pad="20" height="15" name="import_dimensions" follows="top|left">
-        [X] x [Y] x [Z] m
-      </text>
-
-      <text left="10" top_pad="20" follows="top|left" height="15">
-        Include:
-      </text>
-
-      <check_box top_pad="5" name="upload_textures" height="15" follows="top|left" label="Textures"/>
-      <check_box top_pad="5" name="upload_skin" height="15" follows="top|left" label="Skin weight"/>
-      <check_box top_pad="5" left="20" name="upload_joints" height="15" follows="top|left" label="Joint positions"/>
-
-      <text left="10" top_pad="4" width="90" bottom="30" follows="top|left" height="15">
-        Pelvis Z Offset:
-      </text>
-
-      <spinner left="10" top_pad="4" height="20" follows="top|left" width="80" value="0.0" min_val="-3.00" max_val="3.0" name="pelvis_offset"/>
-
-    </panel>
-  </tab_container>
-
-  <text
-	height="16"
-	left_delta="5"
-	bottom_delta="30"
-	name="upload_fee"
-	width="300"
-	follows="bottom|right"
-	word_wrap="true" 
-	>
-	    Upload fee: L$ [FEE]
-  </text>
-  
-  <button bottom="540" left="10"  follows="bottom|left" height="20" label="Set to defaults"
-	     width="100" name="reset_btn" tool_tip="Set to defaults"/>
-  <button left="310"  follows="bottom|right" height="20" label="Calculate weights &amp; fee"
-	     width="150" name="calculate_btn" tool_tip="Calculate weights &amp; fee" top_delta="0"/>
-  <button bottom="540" left="310"  follows="bottom|right" height="20" label="Upload"
-	     width="80" name="ok_btn" tool_tip="Upload to simulator" visible="false"/>
-  <button right="-10" follows="right|bottom" height="20" width="80" label="Cancel" name="cancel_btn" top_delta="0"/>
-  
-  <!--
-  <button bottom_delta="0" left="10" width="120" name="auto fill" label="Generate LOD" tool_tip="Automatically generate levels of detail"/>
-  <button bottom_delta="0" left="140" width="120" name="smooth normals" label="Generate Normals" tool_tip="Regenerate normals based on mesh shape"/>
-  <button bottom_delta="0" left="260" width="120" name="consolidate" label="Consolidate" tool_tip="Combine similar submeshes (reduces number of submeshes)"/>
-  <button bottom_delta="30" left="260" width="120" name="scrub materials" label="Scrub Materials" tool_tip="Remove all material information (clear textures, set all colors to white)."/>
-  
-  <spinner bottom_delta="0" left="140" width="120" height="16" initial_value="75" label_width="60" name="edge threshold" decimal_digits="0" min_val="0" max_val="180" increment="5" label="Hard Angle" tool_tip="Maximum angle that will be smoothed between triangles when using Generate Normals"/>
-
-  <text bottom_delta="30" follows="top|left" height="15" left="10" name="high_lod_label">
-    High LOD:
-  </text>
-  <combo_box bottom_delta="0" left="97" follows="left|top" height="18" 
-             name="high detail combo" width="100" tool_tip="Specify mesh for this level of detail">
-    <combo_item name="high none" value="none">
-      None
-    </combo_item>
-    <combo_item name="high choose file" value="file">
-      Choose File...
-    </combo_item>
-    <combo_item name="high triangle limit" value="limit">
-      Triangle Limit
-    </combo_item>
-  </combo_box>
-  <spinner bottom_delta="-5" left="200" width="120"  name="high limit" decimal_digits="0" increment="1" min_val="0" max_val="100" tool_tip="Triangle budget for this LOD"/>
-  <text bottom_delta="25" follows="top|left" height="15" left="10" name="high info" width="300">
-    [TRIANGLES] Triangles, [VERTICES] Vertices, [SUBMESHES] Submeshes.  
-    [MESSAGE]
-  </text>
-
-  <text bottom_delta="35" follows="top|left" height="15" left="10" name="medium_lod_label">
-    Medium LOD:
-  </text>
-  <combo_box bottom_delta="0" left="97" follows="left|top" height="18"
-             name="medium detail combo" width="100" tool_tip="Specify mesh for this level of detail">
-    <combo_item name="medium none" value="none">
-      None
-    </combo_item>
-    <combo_item name="medium choose file" value="file">
-      Choose File...
-    </combo_item>
-    <combo_item name="medium triangle limit" value="limit">
-      Triangle Limit
-    </combo_item>
-  </combo_box>
-  <spinner bottom_delta="-5" left="200" width="120"  name="medium limit" decimal_digits="0" increment="1" min_val="0" max_val="100" tool_tip="Triangle budget for this LOD"/>
-  <text bottom_delta="25" follows="top|left" height="15" left="10" name="medium info" width="300">
-    [TRIANGLES] Triangles, [VERTICES] Vertices, [SUBMESHES] Submeshes.  
-    [MESSAGE]
-  </text>
-
-  <text bottom_delta="35" follows="top|left" height="15" left="10" name="low_lod_label">
-    Low LOD:
-  </text>
-  <combo_box bottom_delta="0" left="97" follows="left|top" height="18" 
-             name="low detail combo" width="100" tool_tip="Specify mesh for this level of detail">
-    <combo_item name="low none" value="none">
-      None
-    </combo_item>
-    <combo_item name="low choose file" value="file">
-      Choose File...
-    </combo_item>
-    <combo_item name="low triangle limit" value="limit">
-      Triangle Limit
-    </combo_item>
-  </combo_box>
-  <spinner bottom_delta="-5" left="200" width="120"  name="low limit" decimal_digits="0" increment="1" min_val="0" max_val="100" tool_tip="Triangle budget for this LOD"/>
-  <text bottom_delta="25" follows="top|left" height="15" left="10" name="low info" width="300">
-    [TRIANGLES] Triangles, [VERTICES] Vertices, [SUBMESHES] Submeshes
-    [MESSAGE]
-  </text>
-
-  <text bottom_delta="35" follows="top|left" height="15" left="10" name="lowest_lod_label">
-    Lowest LOD:
-  </text>
-  <combo_box bottom_delta="0" left="97" follows="left|top" height="18" 
-             name="lowest detail combo" width="100" tool_tip="Specify mesh for this level of detail">
-    <combo_item name="lowest none" value="none">
-      None
-    </combo_item>
-    <combo_item name="lowest choose file" value="file">
-      Choose File...
-    </combo_item>
-    <combo_item name="lowest triangle limit" value="limit">
-      Triangle Limit
-    </combo_item>
-  </combo_box>
-  <spinner bottom_delta="-5" left="200" width="120"  name="lowest limit" decimal_digits="0" increment="1" min_val="0" max_val="100" tool_tip="Triangle budget for this LOD"/>
-  <text bottom_delta="25" follows="top|left" height="15" left="10" name="lowest info" width="300">
-    [TRIANGLES] Triangles, [VERTICES] Vertices, [SUBMESHES] Submeshes
-    [MESSAGE]
-  </text>
-
-  <text bottom_delta="35" follows="top|left" height="15" left="10" name="physics_lod_label">
-    Physical Shape:
-  </text>
-  <combo_box bottom_delta="0" left="97" follows="left|top" height="18"
-             name="physics detail combo" width="100">
-    <combo_item name="physics none" value="none">
-      None
-    </combo_item>
-    <combo_item name="physics choose file" value="file">
-      Choose File...
-    </combo_item>
-    <combo_item name="physics triangle limit" value="limit">
-      Triangle Limit...
-    </combo_item>
-  </combo_box>
-  <spinner bottom_delta="-5" left="200" width="90"  name="physics limit" decimal_digits="0" increment="1" min_val="0" max_val="100" tool_tip="Triangle budget for this LOD"/>
-  <button bottom_delta="0" left="290" width="30" follows="left|top" height="20" label=">>" 
-          name="decompose_btn" tool_tip="Create convex decomposition."/>
-  <text bottom_delta="25" follows="top|left" height="15" left="10" name="physics info" width="300">
-    [TRIANGLES] Triangles, [HULLS] Hulls, [POINTS] Points
-  </text>
-
-  <text bottom_delta="25" follows="top|left" height="15" left="10" name="include label" width="300">
-    Include:
-  </text>
-
-  <check_box bottom_delta="20" follow="bottom|left" height="20" label="Textures"
-             left="15" width="125" name="upload_textures" tool_tip="Upload associated textures "/>
-
-  <check_box bottom_delta="20" follow="bottom|left" height="20" label="Skin Weights"
-             left="15" width="125" name="upload_skin" tool_tip="Upload vertex skin weighting information."/>
-
-  <check_box bottom_delta="20" follow="bottom|left" height="20" label="Joint Positions"
-             left="15" width="125" name="upload_joints" tool_tip="Upload joint position information (will override avatar joint positions when mesh is worn)."/>
-
-  
-	<button bottom_delta="25" follows="bottom|left" height="20" label="Upload"
-	     left="15" name="ok_btn" width="125" tool_tip="Upload to simulator"/>
-
-  <text bottom_delta="20" left="15" width="280" follows="top|left" height="15" name="description_label" text_color="1 0.82 0.46 1">
-	  (No charge for upload during First Look)
-	</text>
-  <text bottom_delta="20" left="15" width="280" follows="top|left" height="15" name="upload_message">
-    [MESSAGE]
-  </text>
+     follows="top|left"
+     height="80"
+     layout="top|left"
+     left="0"
+     name="weights_and_warning_panel"
+     top_pad="3"
+     width="625">
+       <button
+         follows="top|left"
+         label="Calculate weights &amp; fee"
+         label_color="White"
+         layout="topleft"
+         left="3"
+         name="calculate_btn"
+         top="3"
+         height="20"
+         width="150"
+         tool_tip="Calculate weights &amp;fee"/>
+       <button
+         follows="top|left"
+         label="Cancel"
+         label_color="White"
+         layout="topleft"
+         left_pad="6"
+         name="cancel_btn"
+         top="3"
+         height="20"
+         width="80"/>
+       <button
+         follows="top|left"
+         label="Upload"
+         layout="topleft"
+         label_color="White"
+         left="35"
+         name="ok_btn"
+         top="3"
+         height="20"
+         visible="false"
+         width="80"
+         tool_tip="Upload to simulator"/>
+       <button
+         follows="top|right"
+         label="Clear settings &amp; reset form"
+         label_color="White"
+         layout="topleft"
+         name="reset_btn"
+         right="-2"
+         top="3"
+         height="20"
+         width="155"/>
+       <!-- ========== WEIGHTS ==========-->
+       <text
+         follows="top|left"
+         height="15"
+         layout="topleft"
+         left="5"
+         name="upload_fee"
+         top_pad="10"
+         width="130"
+         word_wrap="true">
+         Upload fee: L$ [FEE]
+       </text>
+       <text
+         height="15"
+         layout="topleft"
+         left_pad="0"
+         name="prim_weight"
+         top_delta="0"
+         width="120"
+         word_wrap="true">
+         Land impact: [EQ]
+       </text>
+       <text
+         height="15"
+         layout="topleft"
+         left_pad="0"
+         name="download_weight"
+         top_delta="0"
+         width="100"
+         word_wrap="true">
+         Download: [ST]
+       </text>
+       <text
+         height="15"
+         top_delta="0"
+         layout="topleft"
+         left_pad="0"
+         name="physics_weight"
+         width="90"
+         word_wrap="true">
+         Physics: [PH]
+       </text>
+       <text
+         height="15"
+         top_delta="0"
+         layout="topleft"
+         left_pad="0"
+         name="server_weight"
+         width="83"
+         word_wrap="true">
+         Server: [SIM]
+       </text>
+       <!-- ========== NOTE MESSAGE ========== -->
+       <text
+         font="SansSerif"
+         layout="topleft"
+         left="6"
+         name="warning_title"
+         top_pad="10"
+         text_color="DrYellow"
+         visible="false"
+         width="40">
+         NOTE:
+       </text>
+       <text
+         text_color="White"
+         height="20"
+         layout="topleft"
+         left_pad="1"
+         name="warning_message"
+         parse_urls="true"
+         top_delta="2"
+         wrap="true"
+         width="462"
+         visible="false">
+         You dont have rights to upload mesh models. [[VURL] Find out how] to get certified.
+       </text>
+       <text text_color="Yellow" layout="topleft" top_delta="20" left="6" name="status">[STATUS]</text>
   
-  <spinner bottom_delta="20" label="Scale" left="15" width="120"  name="debug scale" decimal_digits="3" increment="0.1" min_val="0" max_val="64" initial_value="1" tool_tip="Multiplier for incoming object scale.  If incoming dimensions are very small or very large, modify this value to get dimensions into an acceptable range."/>
-  <text bottom_delta="30" left="15" width="280" follows="top|left" height="15" name="dimensions">
-    Model Dimensions: [X]m x [Y]m x [Z]m
-  </text>
-  -->
+    </panel>
+</panel>
+
+<text 
+ follows="left|top"
+ layout="topleft"
+ left="640"
+ name="lod_label"
+ text_color="White"
+ top="13"
+ height="15"
+ width="290">
+ Preview:
+ </text>
+<panel
+ border="true"
+ bevel_style="none"
+ follows="top|left"
+ name="preview_panel"
+ top_pad="4"
+ width="290"
+ height="290"/>
+
+<panel
+  follows="all"
+  height="130"
+  layout="topleft"
+  name="right_panel"
+  top_pad="5"
+  width="290">
+    <combo_box
+      top_pad="3"
+      follows="left|top"
+      height="18"
+      layout="topleft"
+      name="preview_lod_combo"
+      width="150"
+      tool_tip="LOD to view in preview render">
+        <combo_item name="high">   High   </combo_item>
+        <combo_item name="medium"> Medium </combo_item>
+        <combo_item name="low">    Low    </combo_item>
+        <combo_item name="lowest"> Lowest </combo_item>
+    </combo_box>
+    <text
+      follows="top|left"
+      layout="topleft"
+      text_color="White"
+      top="5"
+      left_pad="20"
+      name="label_display"
+      width="50">
+      Display...
+    </text>
+    <check_box
+      follows="top|left"
+      label="Edges"
+      label_text.text_color="White"
+      layout="topleft"
+      left_delta="0"
+      name="show_edges"
+      top_pad="8">
+    </check_box>
+    <check_box
+      follows="top|left"
+      label="Physics"
+      label_text.text_color="White"
+      layout="topleft"
+      name="show_physics"
+      top_pad="8">
+    </check_box>
+    <check_box
+      follows="top|left"
+      label="Textures"
+      label_text.text_color="White"
+      layout="topleft"
+      name="show_textures"
+      top_pad="8">
+    </check_box>
+    <check_box
+      follows="top|left"
+      label="Skin weights"
+      label_text.text_color="White"
+      layout="topleft"
+      name="show_skin_weight"
+      top_pad="8">
+    </check_box>
+    <check_box
+      follows="top|left"
+      label="Joints"
+      label_text.text_color="White"
+      layout="topleft"
+      name="show_joint_positions"
+      top_pad="8">
+    </check_box>
+    <text
+      follows="top|left"
+      layout="topleft"
+      left="2"
+      name="physics_explode_label"
+      top="85"
+      width="150">
+      Preview Spread:
+    </text>
+    <slider
+      name="physics_explode"
+      follows="top|left"
+      top="100"
+      left="0"
+      min_val="0.0"
+      max_val="3.0"
+      height="20"
+      width="150"/>
+</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
index 3d16ccbc45..b5a5ff5342 100644
--- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
@@ -108,7 +108,7 @@
 		 height="22"
 		 top_pad="15"
 		 width="505"
-		 name="choose_file_header_panel"
+		 name="header_panel"
 		 bg_opaque_color="DkGray2"
 		 background_visible="true"
 		 background_opaque="true"
@@ -117,7 +117,7 @@
 			 width="200"
 			 left="10"
 			 top="3"
-			 name="choose_file_header_text"
+			 name="header_text"
 			 text_color="White"
 			 height="10"
 			 font="SansSerifBig"
@@ -130,7 +130,7 @@
 		 left="15"
 		 height="310"
 		 width="505"
-		 name="choose_file_content_panel"
+		 name="content"
 		 bg_opaque_color="DkGray2"
 		 background_visible="true"
 		 background_opaque="true">
@@ -163,7 +163,7 @@
 			 height="10"
 			 layout="topleft"
 			 left_delta="0"
-			 name="choose_model_file_label"
+			 name="Cache location"
 			 width="320">
 				Choose model file to upload
 			</text>
@@ -199,7 +199,7 @@
 			 height="10"
 			 layout="topleft"
 			 left="10"
-			 name="support_collada_text"
+			 name="Cache location"
 			 width="320">
 				Second Life supports COLLADA (.dae) files
 			</text>
@@ -221,7 +221,6 @@
 			 width="130"
 			 height="14"
 			 left_delta="0"
-			 name="dimensions_label"
 			 text_color="White"
 			 word_wrap="true">
 				Dimensions (meters):
@@ -288,7 +287,7 @@
 		<panel
 		 height="22"
 		 top_pad="15"
-		 name="optimize_header_panel"
+		 name="header_panel"
 		 width="505"
 		 bg_opaque_color="DkGray2"
 		 background_visible="true"
@@ -297,7 +296,7 @@
 			<text
 			 width="200"
 			 left="10"
-			 name="optimize_header_text"
+			 name="header_text"
 			 top="3"
 			 text_color="White"
 			 height="10"
@@ -312,7 +311,7 @@
 		 height="20"
 		 font="SansSerifSmall"
 		 layout="topleft"
-		 name="optimize_hint"
+		 name="description"
 		 word_wrap="true"
 		 left_delta="5">
 			We have optimized the model for performance. Adjust it further if you wish.
@@ -323,12 +322,11 @@
 		 left="15"
 		 height="270"
 		 width="505"
-		 name="optimize_content_panel"
+		 name="content"
 		 bg_opaque_color="DkGray2"
 		 background_visible="true"
 		 background_opaque="true">
 			<text
-			 name="generating_lod_label"
 			 top="20"
 			 width="300"
 			 height="12"
@@ -403,12 +401,12 @@
 				 bg_opaque_color="DkGray2"
 				 background_visible="true"
 				 background_opaque="true">
-			<text name="optimize_performance_text" top="69" left="10" text_color="White" font="SansSerifSmallBold" width="120" height="16" wrap="true">Performance</text>
-			<text name="optimize_faster_rendering_text" top="85" left="10" width="120" word_wrap="true" font="SansSerifSmall" height="40">Faster rendering
+			<text top="69" left="10" text_color="White" font="SansSerifSmallBold" width="120" height="16" wrap="true">Performance</text>
+			<text top="85" left="10" width="120" word_wrap="true" font="SansSerifSmall" height="40">Faster rendering
 Less detail
 Lower prim weight</text>
-			<text name="optimize_accuracy_text" top="69" left="184" text_color="White" font="SansSerifSmallBold" width="120" height="16" wrap="true">Accuracy</text>
-			<text name="optimize_slower_rendering_text" top="85" left="184" width="120" word_wrap="true" font="SansSerifSmall" height="40">Slower rendering
+			<text top="69" left="184" text_color="White" font="SansSerifSmallBold" width="120" height="16" wrap="true">Accuracy</text>
+			<text top="85" left="184" width="120" word_wrap="true" font="SansSerifSmall" height="40">Slower rendering
 More detail
 Higher prim weight</text>
 
@@ -426,24 +424,21 @@ Higher prim weight</text>
 		   top="130"
 		   width="290" />
           <text 
-			font="SansSerifSmall"
-			name="accuracy_slider_mark1" 
+			font="SansSerifSmall" 
 			top_pad="0"  
 			width="5" 
 			left_delta="6" 
 			height="4">'  
           </text>
           <text 
-			font="SansSerifSmall"
-			name="accuracy_slider_mark2" 
+			font="SansSerifSmall" 
 			top_delta="0"  
 			width="5" 
 			left_delta="137" 
 			height="4">'  
           </text>
           <text 
-			font="SansSerifSmall"
-			name="accuracy_slider_mark3" 
+			font="SansSerifSmall" 
 			top_delta="0"  
 			width="5" 
 			left_delta="137" 
@@ -459,7 +454,7 @@ Higher prim weight</text>
 			top_pad="15"
             width="150">
           </button>
-			<text top="10" right="-10" width="185" text_color="White" follows="left|top" height="15" name="geometry_preview_label">
+			<text top="10" right="-10" width="185" text_color="White" follows="left|top" height="15" name="lod_label">
 				Geometry preview
 			</text>
 			<panel
@@ -476,16 +471,16 @@ Higher prim weight</text>
 			</panel>
 			<combo_box left_delta="75" top_pad="10"  follows="left|top" list_position="below" height="22"
 	     name="preview_lod_combo" width="110" tool_tip="LOD to view in preview render">
-				<combo_item name="preview_lod_high">
+				<combo_item name="high">
 					High detail
 				</combo_item>
-				<combo_item name="preview_lod_medium">
+				<combo_item name="medium">
 					Medium detail
 				</combo_item>
-				<combo_item name="preview_lod_low">
+				<combo_item name="low">
 					Low detail
 				</combo_item>
-				<combo_item name="preview_lod_lowest">
+				<combo_item name="lowest">
 					Lowest detail
 				</combo_item>
 			</combo_box>
@@ -502,7 +497,7 @@ Higher prim weight</text>
 		<panel
 		 height="22"
 		 top_pad="15"
-		 name="physics_header_panel"
+		 name="header_panel"
 		 width="505"
 		 bg_opaque_color="DkGray2"
 		 background_visible="true"
@@ -511,7 +506,7 @@ Higher prim weight</text>
 			<text
 			 width="200"
 			 left="10"
-			 name="physics_header_text"
+			 name="header_text"
 			 top="3"
 			 height="10"
 			 font="SansSerifBig"
@@ -526,7 +521,7 @@ Higher prim weight</text>
 		 height="50"
 		 font="SansSerifSmall"
 		 layout="topleft"
-		 name="physics_hint"
+		 name="description"
 		 word_wrap="true"
 		 left_delta="5">
 			We will create a shape for the outer hull of the model. Adjust the shape's detail level as needed for the intended purpose of your model.
@@ -536,16 +531,16 @@ Higher prim weight</text>
 		 left="15"
 		 height="270"
 		 width="505"
-		 name="physics_content_panel"
+		 name="content"
 		 bg_opaque_color="DkGray2"
 		 background_visible="true"
 		 background_opaque="true">
-      <text name="physics_performance_text" top="10" left="10" text_color="White" font="SansSerifSmallBold" width="120" halign="right" height="16" wrap="true">Performance</text>
-      <text name="physics_faster_rendering_text" top="26" left="10" width="120" word_wrap="true" font="SansSerifSmall" halign="right" height="40">Faster rendering
+      <text top="10" left="10" text_color="White" font="SansSerifSmallBold" width="120" halign="right" height="16" wrap="true">Performance</text>
+      <text top="26" left="10" width="120" word_wrap="true" font="SansSerifSmall" halign="right" height="40">Faster rendering
 Less detail
 Lower prim weight</text>
-      <text name="physics_accuracy_text" top="174" left="10" text_color="White" font="SansSerifSmallBold" width="120" halign="right" height="16" wrap="true">Accuracy</text>
-      <text name="physics_slower_dendering_text" top="190" left="10" width="120" word_wrap="true" font="SansSerifSmall" halign="right" height="40">Slower rendering
+      <text top="174" left="10" text_color="White" font="SansSerifSmallBold" width="120" halign="right" height="16" wrap="true">Accuracy</text>
+      <text top="190" left="10" width="120" word_wrap="true" font="SansSerifSmall" halign="right" height="40">Slower rendering
 More detail
 Higher prim weight</text>
 
@@ -563,15 +558,15 @@ Higher prim weight</text>
 		   show_text="false"
 		   top="25"
 		   width="22" />
-      <text name="physics_example_1" top="10" width="120" word_wrap="true" left_pad="10" height="50">Examples:
+      <text top="10" width="120" word_wrap="true" left_pad="10" height="50">Examples:
 Moving objects
 Flying objects
 Vehicles</text>
-      <text name="physics_example_2" top="95" width="120" word_wrap="true" left_delta="0" height="50">Examples:
+      <text top="95" width="120" word_wrap="true" left_delta="0" height="50">Examples:
 Small static objects
 Less detailed objects
 Simple furniture</text>
-      <text name="physics_example_3" top="180" width="120" word_wrap="true" left_delta="0" height="50">Examples:
+      <text top="180" width="120" word_wrap="true" left_delta="0" height="50">Examples:
 Static objects
 Detailed objects
 Buildings</text>
@@ -597,7 +592,7 @@ Buildings</text>
 			visible="false"
             width="150">
           </button>
-			<text top="10" right="-10" width="185" text_color="White" follows="left|top" height="15" name="physics_preview_label">
+			<text top="10" right="-10" width="185" text_color="White" follows="left|top" height="15" name="lod_label">
 				Physics preview
 			</text>
 			<panel
@@ -614,16 +609,16 @@ Buildings</text>
 			</panel>
 			<combo_box left_delta="75" top_pad="10"  follows="left|top" list_position="below" height="22"
 	     name="preview_lod_combo2" width="110" tool_tip="LOD to view in preview render">
-				<combo_item name="preview_lod2_high">
+				<combo_item name="high">
 					High detail
 				</combo_item>
-				<combo_item name="preview_lod2_medium">
+				<combo_item name="medium">
 					Medium detail
 				</combo_item>
-				<combo_item name="preview_lod2_low">
+				<combo_item name="low">
 					Low detail
 				</combo_item>
-				<combo_item name="preview_lod2_lowest">
+				<combo_item name="lowest">
 					Lowest detail
 				</combo_item>
 			</combo_box>
@@ -640,7 +635,7 @@ Buildings</text>
 		<panel
 		 height="22"
 		 top_pad="15"
-		 name="review_header_panel"
+		 name="header_panel"
 		 width="505"
 		 bg_opaque_color="DkGray2"
 		 background_visible="true"
@@ -649,7 +644,7 @@ Buildings</text>
 			<text
 			 width="200"
 			 left="10"
-			 name="review_header_text"
+			 name="header_text"
 			 text_color="White" 
 			 top="3"
 			 height="10"
@@ -663,7 +658,7 @@ Buildings</text>
 		 left="15"
 		 height="310"
 		 width="505"
-		 name="review_content_panel"
+		 name="content"
 		 bg_opaque_color="DkGray2"
 		 background_visible="true"
 		 background_opaque="true">
@@ -711,7 +706,7 @@ Buildings</text>
 		<panel
 		 height="22"
 		 top_pad="15"
-		 name="upload_header_panel"
+		 name="header_panel"
 		 width="505"
 		 bg_opaque_color="DkGray2"
 		 background_visible="true"
@@ -720,7 +715,7 @@ Buildings</text>
 			<text
 			 width="200"
 			 left="10"
-			 name="upload_header_text"
+			 name="header_text"
 			 top="3"
 			 text_color="White" 
 			 height="10"
diff --git a/indra/newview/skins/default/xui/en/floater_object_weights.xml b/indra/newview/skins/default/xui/en/floater_object_weights.xml
new file mode 100644
index 0000000000..eb283a1043
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_object_weights.xml
@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_close="true"
+ can_tear_off="false"
+ height="315"
+ help_topic="object_weights"
+ layout="topleft"
+ name="object_weights"
+ save_rect="true"
+ single_instance="true"
+ title="ADVANCED"
+ width="200">
+    <floater.string
+     name="nothing_selected"
+     value="--"/>
+
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="selected_text"
+     text_color="EmphasisColor"
+     top="10"
+     value="SELECTED"
+     width="180" />
+    <text
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="objects"
+     top_pad="3"
+     value="--"
+     width="40" />
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="10"
+     name="objects_label"
+     top_delta="0"
+     value="Objects"
+     width="130" />
+    <text
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="prims"
+     top_pad="3"
+     value="--"
+     width="40" />
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="10"
+     name="prims_label"
+     top_delta="0"
+     value="Prims"
+     width="130" />
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="0"
+     layout="topleft"
+     left="10"
+     name="selected_text_border"
+     top_pad="5"
+     width="180"/>
+
+
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="weights_of_selected_text"
+     text_color="EmphasisColor"
+     top_pad="10"
+     value="WEIGHTS OF SELECTED"
+     width="180" />
+    <text
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="download"
+     top_pad="3"
+     value="--"
+     width="40" />
+    <loading_indicator
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="34"
+     name="download_loading_indicator"
+     top_delta="0"
+     width="16" />
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="10"
+     name="download_label"
+     top_delta="0"
+     value="Download"
+     width="130" />
+    <text
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="physics"
+     top_pad="3"
+     value="--"
+     width="40" />
+    <loading_indicator
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="34"
+     name="physics_loading_indicator"
+     top_delta="0"
+     width="16" />
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="10"
+     name="physics_label"
+     top_delta="0"
+     value="Physics"
+     width="130" />
+    <text
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="server"
+     top_pad="3"
+     value="--"
+     width="40" />
+    <loading_indicator
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="34"
+     name="server_loading_indicator"
+     top_delta="0"
+     width="16" />
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="10"
+     name="server_label"
+     top_delta="0"
+     value="Server"
+     width="130" />
+    <text
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="display"
+     top_pad="3"
+     value="--"
+     width="40" />
+    <loading_indicator
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="34"
+     name="display_loading_indicator"
+     top_delta="0"
+     width="16" />
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="10"
+     name="display_label"
+     top_delta="0"
+     value="Display"
+     width="130" />
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="0"
+     layout="topleft"
+     left="10"
+     name="weights_text_border"
+     top_pad="5"
+     width="180"/>
+
+
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="land_impacts_text"
+     text_color="EmphasisColor"
+     top_pad="10"
+     value="LAND IMPACTS"
+     width="180" />
+    <text
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="selected"
+     top_pad="3"
+     value="--"
+     width="40" />
+    <loading_indicator
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="34"
+     name="selected_loading_indicator"
+     top_delta="0"
+     width="16" />
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="10"
+     name="selected_label"
+     top_delta="0"
+     value="Selected"
+     width="130" />
+    <text
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="rezzed_on_land"
+     top_pad="3"
+     value="--"
+     width="40" />
+    <loading_indicator
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="34"
+     name="rezzed_on_land_loading_indicator"
+     top_delta="0"
+     width="16" />
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="10"
+     name="rezzed_on_land_label"
+     top_delta="0"
+     value="Rezzed on land"
+     width="130" />
+    <text
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="remaining_capacity"
+     top_pad="3"
+     value="--"
+     width="40" />
+    <loading_indicator
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="34"
+     name="remaining_capacity_loading_indicator"
+     top_delta="0"
+     width="16" />
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="10"
+     name="remaining_capacity_label"
+     top_delta="0"
+     value="Remaining capacity"
+     width="130" />
+    <text
+     follows="left|top"
+     halign="right"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="total_capacity"
+     top_pad="3"
+     value="--"
+     width="40" />
+    <loading_indicator
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="34"
+     name="total_capacity_loading_indicator"
+     top_delta="0"
+     width="16" />
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="10"
+     name="total_capacity_label"
+     top_delta="0"
+     value="Total capacity"
+     width="130" />
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="0"
+     layout="topleft"
+     left="10"
+     name="land_impacts_text_border"
+     top_pad="5"
+     width="180"/>
+
+    <text
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="help_SLURL"
+     top_pad="10"
+     value="[secondlife:///app/help/object_weights What is all this?...]"
+     width="180" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
index 449731ab89..93bfe53aae 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
@@ -29,7 +29,7 @@
 	 height="10"
 	 left_delta="23"
 	 layout="topleft"
-	 name="Proxy location"
+	 name="http_proxy_label"
 	 top_pad="10"
 	 width="300">
 	    HTTP Proxy:
@@ -81,7 +81,7 @@
 	 height="10"
 	 layout="topleft"
 	 left_delta="23"
-	 name="Proxy location"
+	 name="socks5_proxy_label"
 	 top_pad="10"
 	 width="300">
 	    SOCKS 5 Proxy:
@@ -125,7 +125,7 @@
 	 height="10"
 	 layout="topleft"
 	 left="40"
-	 name="Proxy location"
+	 name="socks_auth_label"
 	 top_pad="15"
 	 width="300">
 	    SOCKS Authentication:
@@ -163,6 +163,7 @@
 	 height="10"
 	 layout="topleft"
 	 left_delta="20"
+	 name="socks5_username_label"
 	 top_delta="50"
 	 width="200">
 	    Username:
@@ -174,6 +175,7 @@
 	 height="10"
 	 left_pad="15"
 	 layout="topleft"
+	 name="socks5_password_label"
 	 width="200">
 	    Password:
 	</text>
@@ -207,7 +209,7 @@
 	 height="10"
 	 layout="topleft"
 	 left="25"
-	 name="Proxy location"
+	 name="other_proxy_label"
 	 top_pad="18"
 	 width="300">
 	   Other HTTP traffic proxy:
diff --git a/indra/newview/skins/default/xui/en/floater_publish_classified.xml b/indra/newview/skins/default/xui/en/floater_publish_classified.xml
index 6ce9ed6e77..322e34272c 100644
--- a/indra/newview/skins/default/xui/en/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/en/floater_publish_classified.xml
@@ -36,7 +36,7 @@ Remember, Classified fees are non-refundable.
      left="15"
      value="50"
      min_val="50"
-     max_val="99999"
+     max_val="999999"
      name="price_for_listing"
      top_pad="10"
      tool_tip="Price for listing."
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 8901583799..9b02f7d273 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -48,11 +48,11 @@
     </floater.string>
     <floater.string
      name="status_selectcount">
-        [OBJ_COUNT] objects ( [PRIM_COUNT] prims[PE_STRING] ) selected
+        [OBJ_COUNT] objects selected, land impact [LAND_IMPACT]
     </floater.string>
     <floater.string
-     name="status_selectprimequiv">
-        , [SEL_WEIGHT] prim equivs
+     name="status_remaining_capacity">
+        Remaining capacity [LAND_CAPACITY].
     </floater.string>
     <button
      follows="left|top"
@@ -738,11 +738,11 @@
 	  font="SansSerifSmall"
 	  layout="topleft"
 	  left="10"
-	  name="selection_weight"
+	  name="remaining_capacity"
 	  top_pad="0"
 	  visible="false"
 	  width="280">
-	  Physics weight [PHYS_WEIGHT], Render Cost [DISP_WEIGHT].
+	  [CAPACITY_STRING] [secondlife:///app/openfloater/object_weights More info]
 	</text>
     <!-- <text -->
     <!-- text_color="LtGray_50" -->
@@ -2000,25 +2000,21 @@ even though the user gets a free copy.
              visible="false"
              width="150">
                 <combo_box.item
-                 label="(none)"
-                 name="None"
-                 value="None" />
-                <combo_box.item
                  label="Sphere"
                  name="Sphere"
-                 value="Sphere" />
+                 value="1" />
                 <combo_box.item
                  label="Torus"
                  name="Torus"
-                 value="Torus" />
+                 value="2" />
                 <combo_box.item
                  label="Plane"
                  name="Plane"
-                 value="Plane" />
+                 value="3" />
                 <combo_box.item
                  label="Cylinder"
                  name="Cylinder"
-                 value="Cylinder" />
+                 value="4" />
               </combo_box>
         </panel>
         <panel
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 1ba204473f..efa61dbd11 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -16,7 +16,7 @@
              function="Floater.Show"
              parameter="preferences" />
         </menu_item_call>
-        <menu_item_call
+         <menu_item_call
          label="Toolbars..."
          name="Toolbars"
          shortcut="control|T">
@@ -1285,7 +1285,7 @@
                  parameter="stats" />
             </menu_item_check>
       <menu_item_check
-        label="Show Avatar Rendering Cost"
+        label="Show Draw Weight for Avatars"
         name="Avatar Rendering Cost">
            <menu_item_check.on_check
             function="Advanced.CheckInfoDisplay"
@@ -2444,6 +2444,16 @@
            parameter="raycast" />
         </menu_item_check>
 		<menu_item_check
+         label="Render Complexity"
+         name="rendercomplexity">
+          <menu_item_check.on_check
+           function="Advanced.CheckInfoDisplay"
+           parameter="rendercomplexity" />
+          <menu_item_check.on_click
+           function="Advanced.ToggleInfoDisplay"
+           parameter="rendercomplexity" />
+        </menu_item_check>
+		<menu_item_check
          label="Sculpt"
          name="Sculpt">
           <menu_item_check.on_check
@@ -2863,7 +2873,7 @@
                  function="ToggleControl"
                  parameter="BottomPanelNew" />
             </menu_item_check>-->
-          <menu_item_call
+            <menu_item_call
              label="Media Browser Test"
              name="Web Browser Test">
                 <menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 719d3531ed..21c9eb7437 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -63,65 +63,65 @@
            min_width="340"
            name="navigation_layout_panel"
            width="340">
-             <panel
-               background_visible="false"
-               follows="left|top|right"
-               top="3"
-               height="23"
-               layout="topleft"
+	<panel
+	 background_visible="false"
+	 follows="left|top|right"
+	 top="3"
+	 height="23"
+	 layout="topleft"
                left="0"
-               name="navigation_panel"
+	 name="navigation_panel"
                width="340">
-                 <pull_button
-                   follows="left|top"
-                   direction="down"
-                   height="23"
-                   image_overlay="Arrow_Left_Off"
-                   image_bottom_pad="1"
-                   layout="topleft"
-                   left="10"
-                   name="back_btn"
-                   tool_tip="Go back to previous location"
-                   top="2"
-                   width="31" />
-                 <pull_button
-                   follows="left|top"
-                   direction="down"
-                   height="23"
-                   image_overlay="Arrow_Right_Off"
-                   image_bottom_pad="1"
-                   layout="topleft"
-                   left_pad="0"
-                   name="forward_btn"
-                   tool_tip="Go forward one location"
-                   top_delta="0"
-                   width="31" />
-                 <button
-                   follows="left|top"
-                   height="23"
-                   image_bottom_pad="1"
-                   image_overlay="Home_Off"
-                   layout="topleft"
-                   left_pad="7"
-                   name="home_btn"
-                   tool_tip="Teleport to my home location"
-                   top_delta="0"
-                   width="32"/>
-                 <location_input
+	     <pull_button
+	     follows="left|top"
+	     direction="down"
+	     height="23"
+	     image_overlay="Arrow_Left_Off"
+	     image_bottom_pad="1"
+	     layout="topleft"
+	     left="10"
+	     name="back_btn"
+	     tool_tip="Go back to previous location"
+	     top="2"
+	     width="31" />
+	    <pull_button
+	     follows="left|top"
+	     direction="down"
+	     height="23"
+	     image_overlay="Arrow_Right_Off"
+	     image_bottom_pad="1"
+	     layout="topleft"
+	     left_pad="0"
+	     name="forward_btn"
+	     tool_tip="Go forward one location"
+	     top_delta="0"
+	     width="31" />
+	    <button
+	     follows="left|top"
+	     height="23"
+	     image_bottom_pad="1"
+	     image_overlay="Home_Off"
+	     layout="topleft"
+	     left_pad="7"
+	     name="home_btn"
+	     tool_tip="Teleport to my home location"
+	     top_delta="0"
+	     width="32" />
+	    <location_input
                    follows="all"
-                   halign="right"
-                   height="23"
-                   label="Location"
-                   layout="topleft"
-                   left_pad="7"
-                   max_chars="254"
-                   mouse_opaque="false"
-                   name="location_combo"
-                   top_delta="0"
+	     halign="right"
+	     height="23"
+	     label="Location"
+	     layout="topleft"
+	     left_pad="7"
+	     max_chars="254"
+	     mouse_opaque="false"
+	     name="location_combo"
+	     top_delta="0"
                    width="215">
-                 <combo_list
-                   mouse_wheel_opaque="true"/>
-                 </location_input>
+         <combo_list
+         mouse_wheel_opaque="true"/>
+	    </location_input>
              </panel>
          </layout_panel>
          
@@ -146,47 +146,47 @@
          
          <layout_panel
            follows="top|left"
-           layout="topleft"
+	     layout="topleft"
            auto_resize="true"
            user_resize="true"
            min_width="335"
            name="favorites_layout_panel"
            width="335">
-             <favorites_bar
-               follows="left|right|top"
-               font="SansSerifSmall"
+    <favorites_bar
+     follows="left|right|top"
+     font="SansSerifSmall"
                height="20"
-               layout="topleft"
-               left="0"
-               name="favorite"
-               image_drag_indication="Accordion_ArrowOpened_Off"
-               tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
+     layout="topleft"
+     left="0"
+     name="favorite"
+     image_drag_indication="Accordion_ArrowOpened_Off"
+     tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
                width="331">
-                 <label
-                   follows="left|top"
-                   height="15"
-                   layout="topleft"
-                   left="10"
-                   name="favorites_bar_label"
-                   text_color="LtGray"
-                   tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
-                   top="12"
-                   width="102">
-                    Favorites Bar
-                 </label>
+        <label
+         follows="left|top"
+         height="15"
+         layout="topleft"
+         left="10"
+         name="favorites_bar_label"
+         text_color="LtGray"
+         tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
+         top="12"
+         width="102">
+          Favorites Bar
+        </label>
                  <!-- More button actually is a text box. -->
                  <more_button
                    follows="left|bottom"
                    font.name="SansSerifSmall"
                    font.style="UNDERLINE"
                    name=">>"
-                   tab_stop="false"
-                   tool_tip="Show more of My Favorites"
-                   top="15"
+                     tab_stop="false"
+                     tool_tip="Show more of My Favorites"
+		     top="15"
                    width="50">
                    More...
                    </more_button>
-             </favorites_bar>
+  </favorites_bar>
          </layout_panel>
      
      </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index c131649fc8..d06ba1bc01 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -95,16 +95,61 @@
 	 mouse_opaque="false"
 	 visible="true"
 	 width="18"
-   top_pad="2"
+   top_pad="10"
    left="30" />
+  <text
+   follows="left|top"
+   type="string"
+   length="1"
+   height="10"
+   layout="topleft"
+   left="78"
+   name="keyboard_lbl"
+   width="270"
+   top_delta="2">
+   Keyboard:
+  </text>
+  <check_box
+   control_name="ArrowKeysAlwaysMove"
+   follows="left|top"
+   height="20"
+   label="Arrow keys always move me"
+   layout="topleft"
+   left_delta="5"
+   name="arrow_keys_move_avatar_check"
+   width="237"
+   top_pad="5"/>
+  <check_box
+   control_name="AllowTapTapHoldRun"
+   follows="left|top"
+   height="20"
+   label="Tap-tap-hold to run"
+   layout="topleft"
+   left_delta="0"
+   name="tap_tap_hold_to_run"
+   width="237"
+   top_pad="0"/>
+  <text
+   follows="left|top"
+   type="string"
+   length="1"
+   height="10"
+   layout="topleft"
+   left="78"
+   name="mouse_lbl"
+   width="270"
+   top_pad="15">
+   Mouse:
+  </text>
   <check_box
    control_name="FirstPersonAvatarVisible"
    follows="left|top"
    height="20"
    label="Show me in Mouselook"
    layout="topleft"
-   left_pad="30"
+   left_delta="5"
    name="first_person_avatar_visible"
+   top_pad="5"
    width="256" />
   <text
    type="string"
@@ -126,7 +171,7 @@
    initial_value="2"
    layout="topleft"
    show_text="false"
-   left_pad="5"
+   left_pad="0"
    max_val="15"
    name="mouse_sensitivity"
    top_delta="-1"
@@ -141,26 +186,6 @@
    top_delta="0"
    width="128" />
   <check_box
-   control_name="ArrowKeysAlwaysMove"
-   follows="left|top"
-   height="20"
-   label="Arrow keys always move me"
-   layout="topleft"
-   left="78"
-   name="arrow_keys_move_avatar_check"
-   width="237"
-   top_pad="10"/>
-  <check_box
-   control_name="AllowTapTapHoldRun"
-   follows="left|top"
-   height="20"
-   label="Tap-tap-hold to run"
-   layout="topleft"
-   left_delta="0"
-   name="tap_tap_hold_to_run"
-   width="237"
-   top_pad="0"/>
-  <check_box
    follows="left|top"
    height="20"
    label="Double-Click to:"
@@ -181,7 +206,7 @@
     <radio_item
      height="16"
      label="Teleport"
-     layout="topleft"
+   layout="topleft"
      left="0"
      name="radio_teleport"
      top_delta="20"
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index 3f9195d092..44c84e69a1 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -133,17 +133,7 @@
      tool_tip="Let people see this region and its parcels in search results"
      top="190"
      width="80" />
-	<check_box
-     visible="FALSE"
-     height="20"
-     label="Allow Mesh Objects"
-     layout="topleft"
-     left="10"
-     name="mesh_rez_enabled_check"
-     tool_tip="Let people rez mesh objects on this region"
-     top="210"
-     width="80" />
-    <spinner
+	<spinner
      decimal_digits="0"
      follows="left|top"
      height="20"
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index cf684781b6..1f298cbe16 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -76,7 +76,7 @@
      width="55" />
   </panel>
     <text
-      type="string"
+     type="string"
      font="SansSerifSmall"
      text_readonly_color="TimeTextColor"
      follows="right|top"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index c2394a3fa2..6600339ad7 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -55,7 +55,7 @@
                 Mixed Sale
             </panel.string>
     <button
-     follows="top|right"
+     follows="top|left"
      height="24"
      image_hover_unselected="BackButton_Over"
      image_pressed="BackButton_Press"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 158e1c711d..f021fdd6a1 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3439,7 +3439,7 @@ Abuse Report</string>
   <string name="Female - Stick tougue out">Female - Stick tougue out</string>
   <string name="Female - Wow">Female - Wow</string>
 
-  <string name="/bow1">/bow1</string>
+  <string name="/bow">/bow</string>
   <string name="/clap">/clap</string>
   <string name="/count">/count</string>
   <string name="/extinguish">/extinguish</string>
@@ -3701,4 +3701,13 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_View_Tooltip">Changing camera angle</string>
   <string name="Command_Voice_Tooltip">People nearby with voice capability</string>
 
-</strings>
+ <!-- Mesh UI terms -->
+  <string name="Retain%">Retain%</string>
+  <string name="Detail">Detail</string>
+  <string name="Better Detail">Better Detail</string>
+  <string name="Surface">Surface</string>
+  <string name="Solid">Solid</string>
+  <string name="Wrap">Wrap</string>
+  <string name="Preview">Preview</string>
+  <string name="Normal">Normal</string>
+  </strings>
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index 125eb79d04..93bb8444b4 100644
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -42,15 +42,23 @@ Versión del servidor de voz: [VOICE_VERSION]
 			<button label="Copiar al portapapeles" name="copy_btn" width="165"/>
 		</panel>
 		<panel label="Créditos" name="credits_panel">
-			<text_editor name="credits_editor">
-				Te ofrecen Second Life Philip, Tessa, Andrew, Cory, Ian, James, Phoenix, Ryan, Haney, Dan, Char, Ben, John, Tanya, Eddie, Richard, Mitch, Doug, Eric, Frank, Bruce, Aaron, Peter, Alice, Charlie, Debra, Eileen, Helen, Janet, Steffan, Steve, Tom, Mark, Hunter, Xenon, Burgess, Bill, Jim, Lee, Hamlet, Daniel, Jeff, Todd, Sarah, Tim, Stephanie, Colin, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Jack, Vektor, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Jesse, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Yuko, Makiko, Thomas, Harry, Seth, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Brad, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, Beez, Milo, Hermia, Red, Thrax, Gulliver, Joe, Sally, Paul, Jose, Rejean, Dore, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, Dustin, George, Del, Matthew, Cat, Jacqui, Adrian, Viola, Alfred, Noel, Irfan, Yool, Rika, Jane, Frontier, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Jeremy, JP, Jake, Anthony, Maurice, Madhavi, Leopard, Kyle, Joon, Bert, Belinda, Jon, Kristi, Bridie, Pramod, Socrates, Maria, Aric, Adreanne, Jay, Kari, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Colossus, Zen, BigPapi, Pastrami, Kurz, Mani, Neuro, Mel, Sardonyx, MJ, Rowan, Sgt, Elvis, Samuel, Leo, Bryan, Niko, Austin, Soft, Poppy, Rachel, Aki, Banzai, Alexa, Sue, Bender, CG, Angelo, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Rothman, Niall, Marin, Allison, Katie, Dawn, Dusty, Katt, Judy, Andrea, Ambroff, Infinity, Rico, Gail, Kalpana, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Maestro, Simone, Yang, T, Shannon, Nelson, Khanh, Scott, Courtney, Charlene, Quixote, Susan, Zed, Amanda, Katelin, Enkidu, Roxie, Esbee, JoRoan, Scarlet, Tay, Kevin, Wolfgang, Johnny, Ray, Andren, Merov, Bob, Rand, Howard, Callen, Heff, Galen, Newell, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl, Ashley, JessieAnn, Huseby, Karina, Paris, Kurt, Rick, Lis, Kotler, Theeba, Lynx, Murphy, Doten, Taka, Norm, Jillian, Marcus, Mae, Novack, Esther, Perry, Dana, Ducot, Javier, Porter, Madison, Gecko, Dough, JR, Gisele, Crimp, Norie, Arch, Kimi, Fisher, Barbara, Jason, Peggy, Bernard, Jules, Leroy, Eva, Khederian, Campbell, Vogt, Masido, Karel, Torres, Lo, Breezer, Delby, Rountree, Anna, Servus, Rue, Itiaes, Chuck, Luna, Novella, Zaza, Wen, Gino, Lex, Cassandra, Limey, Nancy, Anukul, Silver, Brodesky, Jinsai, Squid, Gez, Rakesh, Ladan, Edelman, Marcet, Squire, Tatem, Tony, Jerm, Tia, Falcon, BK, Tiggs, Driscoll, Bacon, Timothee, Cru, Carmilla, Coyot, Webb, Kazu, Rudas, LJ, Sea, Ali Wallace, Bewest, Pup, Drub, Dragon, Inoshiro, Byron, Rhett, Xandix, Aimee, Fredrik, Thor, Teddy, Baron, Nelly, Ghengis, Epic, Eli, Stone, Grapes, Irie, Prep, Scobu, Valerie, Alain, y muchos otros.
-
-Gracias a estos Residentes por ayudarnos a estar seguros de que, con todo, esta es la mejor versión: Drew Dwi, Zai Lynch, Latif Khalifa, Ellla McMahon, Harleen Gretzky, Squirrel Wood, Malarthi Behemoth, Dante Tucker, Buckaroo Mu, Eddi Decosta, Dirk Talamasca, Torben Trautman, Irene Muni, Aralara Rajal, Aura Dirval, Cayu Cluny, Eva Rau, FreeSL Aeon, Frontera Thor, Inma Rau, Lunita Savira, Minerva Memel, Polo Gufler, Xiki Luik, Lilly Zenovka, Vick Forcella, Sasy Scarborough, Gentle Welinder, Elric Anatine, Techwolf Lupindo, Dusan Writer, WolfPup Lowenhar, Marianne McCann, Fiachra Lach, Sitearm Madonna, Sudane Erato, Sahkolihaa Contepomi, Sachi Vixen, Questar Utu, Dimitrio Lewis, Matto Destiny, Scrim Pinion, Radio Signals, Psi Merlin, Pixel Gausman, Mel Vanbeeck, Laurent Bechir, Lamorna Proctor, Lares Carter, Gwyneth Llewelyn, Hydra Shaftoe, Holger Gilruth, Gentle Heron, Carla Broek, Boroondas Gupte, Fury Rosewood, Flower Ducatillon, Colpo Wexler, gwampa Lomu, Borg Capalini, Beansy Twine, Ardy Lay, 45ms Zhong, Adeon Writer, Aeonix Aeon, Ai Austin, Aiko Ying, Alexandrea Fride, Alliez Mysterio, Annie Milestone, Annika Genezzia, Ansariel Hiller, ArminasX Saiman, Arya Braveheart, Asaeda Meltingdots, Asturkon Jua, Avallyn Oakleaf, Avatar Quinzet, BabyA Littlething, Bacchus Ireto, Bazaar, Riva, Benjamin Bigdipper, Beth Walcher, Bezilon Kasei, Biancaluce Robbiani, Bill Walach, blakopal Galicia, Blitzckreed Levenque, Bryn Oh, Callipygian Christensen, Cap Carver, Carr Arbenlow, Chantal Harvey, Charles Courtois, Charlie Sazaland, Cherry Cheevers, ChickyBabes Zuzu, Christopher  Organiser, Ciaran Laval, Clara Young, Celierra Darling, Corinne Helendale, Corro Moseley, Coughdrop Littlething, Darien Caldwell, Dartagan Shepherd, Debs Regent, Decro Schmooz, Denim Kamachi, DiJodi Dubratt, Dil Spitz, Edgware Marker, Egehan Dryke, Emma Portilo, Emmie Fairymeadow, Evangelista Emerald, Faelon Swordthain, Frenchimmo Sabra, Gaberoonie Zanzibar, Ganymedes Costagravas, Gene Frostbite, GeneJ Composer, Giggles Littlebird, Grady Echegaray, Guni Greenstein, Gypsy Tripsa, Hackshaven Harford, Ham Rambler, Han Shuffle, Hanglow Short, Hatzfeld Runo, herina Bode, Horatio Freund, Hypatia Callisto, Hypatia Pickens, Identity Euler, Imnotgoing Sideways, Innula Zenovka, Iyoba Tarantal, Jack Abraham, Jagga Meredith, Jennifer Boyle, Jeremy Marquez, Jessica Qin, Jinx Nordberg, Jo Bernandes, Jocial Sonnenkern, Joel Savard, Jondan Lundquist, Josef Munster, Josette Windlow, Juilan Tripsa, Juro Kothari, Justin RiversRunRed, Kagehi Kohn, Kaimen Takahe, Keklily Longfall, Ken Lavender, Kestral Karas, Khisme Nitely, Kimar Coba, Kithrak Kirkorian, Kitty Barnett, Kolor Fall, Komiko Okamoto, Korvel Noh, Larry Pixel, Leal Choche, len Starship, Lenae Munz, Lexi Frua, Lillie Cordeaux, Lizzy Macarthur, LSL Scientist, Luban Yiyuan, Luc Starsider, Maccus McCullough, Madison Blanc, Maggie Darwin, Mallory Destiny, Manx Wharton, Marc Claridge, Marc2 Sands, Matthew Anthony, Maxim RiversRunRed, Medhue Simoni, Melinda Latynina, Mencius Watts, Michi Lumin, Midian Farspire, Miles Glaz, Mindy Mathy, Mitch Wagner, Mo Hax, Mourna Biziou, Nao Noe, naofan Teardrop, Naomah Beaumont, Nathiel Siamendes, Nber Medici, Neko Link, Netpat Igaly, Neutron Chesnokov, Newfie Pendragon, Nicholai Laviscu, Nick Rhodes, Nicoladie Gymnast, Ollie Kubrick, Orenj Marat, Orion Delphis, Oryx Tempel, Parvati Silverweb, PeterPunk Mooney, Pixel Scientist, Pounce Teazle, Professor Noarlunga, Quantum Destiny, Quicksilver Hermes, Ralf Setsuko, RAT Quan, RedMokum Bravin, Revolution Perenti, Rezit Sideways, Rich Grainger, Rosco Teardrop, Rose Evans, Rudee Voom, RufusTT Horsefly, Saii Hallard, SaintLEOlions Zimer, Samm Larkham, Satanello Miami, SexySteven Morrisey, Sheet Spotter, Shnurui Troughton, sicarius Thorne, Sicarius Toxx, Sini Nubalo, SLB Wirefly, snowy Sidran, Soupa Segura, ST Mensing, Starshine Halasy, Stickman Ingmann, Synystyr Texan, Takeda Terrawyng, Tali Rosca, Templar Merlin, Tezcatlipoca Bisiani, Tiel Stonecutter, Tony Kembia, TouchaHoney Perhaps, Trey Reanimator, TriloByte Zanzibar, Trinity Dechou, Trinity Dejavu, Unlikely Quintessa, UsikuFarasi Kanarik, Veritas Raymaker, Vex Streeter, Viaticus Speculaas, Villain Baroque, Vixie Durant, Void Singer, Watty Berkson, Westley Schridde, Westley Streeter, Whimsy Winx, Winter Ventura, Wundur Primbee, xstorm Radek, YongYong Francois, Zak Westminster, Zana Kohime, Zaren Alexander, Zeja Pyle, ZenMondo Wormser, Zoex Flanagan, y muchos otros.
-
-
-
-
-&quot;El trabajo sigue avanzando, la causa perdura, la esperanza aún vive, y los sueños no morirán jamás&quot; - Edward Kennedy
+			<text name="linden_intro">
+				Second Life ofrecido por los Lindens:
+			</text>
+			<text_editor name="linden_names">
+				Philip, Andrew, Doug, Richard, Phoenix, Ian, Mark, Robin, Dan, Char, Ryan, Eric, Jim, Lee, Jeff, Michael, Kelly, Steve, Catherine, Bub, Ramzi, Jill, Jeska, Don, Kona, Callum, Charity, Jack, Shawn, babbage, James, Lauren, Blue, Brent, Reuben, Pathfinder, Jesse, Patsy, Torley, Bo, Cyn, Jonathan, Gia, Annette, Ginsu, Harry, Lex, Runitai, Guy, Cornelius, Beth, Swiss, Thumper, Wendy, Teeple, Seth, Dee, Mia, Sally, Liana, Aura, Beez, Milo, Red, Gulliver, Marius, Joe, Jose, Dore, Justin, Nora, Morpheus, Lexie, Amber, Chris, Xan, Leyla, Walker, Sabin, Joshua, Hiromi, Tofu, Fritz, June, Jean, Ivy, Dez, Ken, Betsy, Which, Spike, Rob, Zee, Dustin, George, Claudia, del, Matthew, jane, jay, Adrian, Yool, Rika, Yoz, siobhan, Qarl, Benjamin, Beast, Everett, madhavi, Christopher, Izzy, stephany, Jeremy, sean, adreanne, Pramod, Tobin, sejong, Iridium, maurice, kj, Meta, kari, JP, bert, kyle, Jon, Socrates, Bridie, Ivan, maria, Aric, Coco, Periapse, sandy, Storrs, Lotte, Colossus, Brad, Pastrami, Zen, BigPapi, Banzai, Sardonyx, Mani, Garry, Jaime, Neuro, Samuel, Niko, CeeLo, Austin, Soft, Poppy, emma, tessa, angelo, kurz, alexa, Sue, CG, Blake, Erica, Brett, Bevis, kristen, Q, simon, Enus, MJ, laurap, Kip, Scouse, Ron, Ram, kend, Marty, Prospero, melissa, kraft, Nat, Seraph, Hamilton, Lordan, Green, miz, Ashlei, Trinity, Ekim, Echo, Charlie, Rowan, Rome, Jt, Doris, benoc, Christy, Bao, Kate, Tj, Patch, Cheah, Johan, Brandy, Angela, Oreh, Cogsworth, Lan, Mitchell, Space, Bambers, Einstein, Bender, Malbers, Matias, Maggie, Rothman, Milton, Niall, Marin, Allison, Mango, Andrea, Katt, Yi, Ambroff, Rico, Raymond, Gail, Christa, William, Dawn, Usi, Dynamike, M, Corr, Dante, Molly, kaylee, Danica, Kelv, Lil, jacob, Nya, Rodney, elsie, Blondin, Grant, Nyx, Devin, Monty, Minerva, Keira, Katie, Jenn, Makai, Clare, Joy, Cody, Gayathri, FJ, spider, Oskar, Landon, Jarv, Noelle, Al, Doc, Gray, Vir, t, Maestro, Simone, Shannon, yang, Courtney, Scott, charlene, Quixote, Susan, Zed, Amanda, Katelin, Esbee, JoRoan, Enkidu, roxie, Scarlet, Merov, Kevin, Judy, Rand, Newell, Les, Dessie, Galen, Michon, Geo, Siz, Calyle, Pete, Praveen, Callen, Sheldon, Pink, Nelson, jenelle, Terrence, Nathan, Juan, Sascha, Huseby, Karina, Kaye, Kotler, Lis, Darv, Charrell, Dakota, Kimmora, Theeba, Taka, Mae, Perry, Ducot, dana, Esther, Dough, gisele, Doten, Viale, Fisher, jessieann, ashley, Torres, delby, rountree, kurt, Slaton, Madison, Rue, Gino, Wen, Casssandra, Brodesky, Squid, Gez, Rakesh, Gecko, Ladan, Tony, Tatem, Squire, Falcon, BK, Crimp, Tiggs, Bacon, Coyot, Carmilla, Webb, Sea, Arch, Jillian, Jason, Bernard, Vogt, Peggy, dragon, Pup, xandix, Wallace, Bewest, Inoshiro, Rhett, AG, Aimee, Ghengis, Itiaes, Eli, Steffan, Epic, Grapes, Stone, Prep, Scobu, Robert, Alain, Carla, Vicky, Tia, Alec, Taras, Lisa, Oz, Ariane, Log, House, Kazu, Kim, Drofnas, Tyler, Campbell, Michele, Madeline, Nelly, Baron, Thor, Lori, Hele, Fredrik, Teddy, Pixie, Berry, Gabrielle, Alfonso, Brooke, Wolf, Ringo, Cru, Charlar, Rodvik, Gibson, Elise, Bagman, Greger, Leonidas, Jerm, Leslie, CB, Brenda, Durian, Carlo, mm, Zeeshan, Caleb, Max, Elikak, Mercille, Steph, Chase
+			</text_editor>
+			<text name="contrib_intro">
+				con contribuciones de código abierto de:
+			</text>
+			<text_editor name="contrib_names">
+				Dummy Name sustituido durante la ejecución
+			</text_editor>
+			<text name="trans_intro">
+				y traducido por:
+			</text>
+			<text_editor name="trans_names">
+				Dummy Name sustituido durante la ejecución
 			</text_editor>
 		</panel>
 		<panel label="Licencias" name="licenses_panel">
diff --git a/indra/newview/skins/default/xui/es/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/es/floater_preferences_proxy.xml
new file mode 100644
index 0000000000..f656f5d662
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_preferences_proxy.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Proxy Settings Floater" title="Configuración de proxy">
+	<check_box initial_value="false" label="Usar proxy HTTP para páginas web" name="web_proxy_enabled"/>
+	<text name="http_proxy_label">
+		Proxy HTTP:
+	</text>
+	<line_editor name="web_proxy_editor" tool_tip="El nombre DNS o la dirección IP del proxy HTTP que quieres usar."/>
+	<spinner label="Nº del puerto:" name="web_proxy_port" tool_tip="El puerto del proxy HTTP que quieres usar."/>
+	<check_box label="Usar proxy SOCKS 5 para el tráfico UDP" name="socks_proxy_enabled"/>
+	<text name="socks5_proxy_label">
+		Proxy SOCKS 5:
+	</text>
+	<line_editor name="socks_proxy_editor" tool_tip="El nombre DNS o la dirección IP del proxy SOCKS 5 que quieres usar."/>
+	<spinner label="Nº del puerto:" name="socks_proxy_port" tool_tip="El puerto del proxy SOCKS 5 que quieres usar."/>
+	<text name="socks_auth_label">
+		Autenticación SOCKS:
+	</text>
+	<radio_group name="socks5_auth_type">
+		<radio_item label="Sin autenticación" name="Socks5NoAuth" tool_tip="El proxy Socks5 no necesita autenticación." value="Ninguno"/>
+		<radio_item label="Nombre de usuario/contraseña" name="Socks5UserPass" tool_tip="El proxy Socks5 necesita autenticación con nombre de usuario y contraseña." value="UserPass"/>
+	</radio_group>
+	<text name="socks5_username_label">
+		Nombre de usuario:
+	</text>
+	<text name="socks5_password_label">
+		Contraseña:
+	</text>
+	<line_editor name="socks5_username" tool_tip="El nombre de usuario utilizado para la autenticación con tu servidor SOCKS 5"/>
+	<line_editor name="socks5_password" tool_tip="La contraseña utilizada para la autenticación con tu servidor SOCKS 5"/>
+	<text name="other_proxy_label">
+		Otro proxy de tráfico HTTP:
+	</text>
+	<radio_group name="other_http_proxy_type">
+		<radio_item label="No usar proxy" name="OtherNoProxy" tool_tip="El tráfico HTTP no web NO se enviará a un proxy." value="Ninguno"/>
+		<radio_item label="Usar proxy HTTP" name="OtherHTTPProxy" tool_tip="HTTP no web se transmitirá a través del proxy web configurado." value="Web"/>
+		<radio_item label="Usar Proxy SOCKS 5" name="OtherSocksProxy" tool_tip="El tráfico HTTP no web se transmitirá a través del proxy Socks 5 configurado." value="Socks"/>
+	</radio_group>
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/menu_inventory.xml b/indra/newview/skins/default/xui/es/menu_inventory.xml
index e873d31580..f1f1ef091f 100644
--- a/indra/newview/skins/default/xui/es/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/es/menu_inventory.xml
@@ -83,5 +83,7 @@
 	<menu_item_call label="Editar" name="Wearable Edit"/>
 	<menu_item_call label="Añadir" name="Wearable Add"/>
 	<menu_item_call label="Quitarse" name="Take Off"/>
+	<menu_item_call label="Copiar al Buzón de salida de comerciante" name="Merchant Copy"/>
+	<menu_item_call label="Mover al Buzón de salida de comerciante" name="Merchant Move"/>
 	<menu_item_call label="--sin opciones--" name="--no options--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/es/menu_media_ctrl.xml b/indra/newview/skins/default/xui/es/menu_media_ctrl.xml
index 8ea9286d8e..b4dfe9907a 100644
--- a/indra/newview/skins/default/xui/es/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/es/menu_media_ctrl.xml
@@ -3,4 +3,5 @@
 	<menu_item_call label="Cortar" name="Cut"/>
 	<menu_item_call label="Copiar" name="Copy"/>
 	<menu_item_call label="Pegar" name="Paste"/>
+	<menu_item_call label="Abrir el inspector web" name="open_webinspector"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_mode_change.xml b/indra/newview/skins/default/xui/es/menu_mode_change.xml
new file mode 100644
index 0000000000..608505d192
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_mode_change.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Mode Change">
+	<menu_item_check label="Básico" name="BasicMode"/>
+	<menu_item_check label="Avanzado" name="AdvancedMode"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index b0d16d1ca4..bc8a5731ab 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -138,7 +138,6 @@
 			<menu_item_call label="Sonido ([COST] L$)..." name="Upload Sound"/>
 			<menu_item_call label="Animación ([COST] L$)..." name="Upload Animation"/>
 			<menu_item_call label="Modelo..." name="Upload Model"/>
-			<menu_item_call label="Asistente de modelo..." name="Upload Model Wizard"/>
 			<menu_item_call label="Masivo ([COST] L$ por archivo)..." name="Bulk Upload"/>
 		</menu>
 		<menu_item_call label="Deshacer" name="Undo"/>
@@ -248,6 +247,7 @@
 			<menu_item_check label="Mostrar información de textura" name="Show Texture Info"/>
 			<menu_item_check label="Show Color Under Cursor" name="Show Color Under Cursor"/>
 			<menu_item_check label="Mostrar la memoria" name="Show Memory"/>
+			<menu_item_check label="Mostrar información de memoria privada" name="Show Private Mem Info"/>
 			<menu_item_check label="Show Updates to Objects" name="Show Updates"/>
 		</menu>
 		<menu label="Force an Error" name="Force Errors">
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 2ec1b333a9..4fb29b9427 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -85,6 +85,19 @@ Asegúrate de que tu conexión a Internet está funcionando adecuadamente.
 		¿Guardar los cambios en las ropas o partes del cuerpo actuales?
 		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="No guardarlos" yestext="Guardarlos"/>
 	</notification>
+	<notification name="ConfirmNoCopyToOutbox">
+		No tienes permiso para copiar este objeto en el Buzón de salida de comerciante. ¿Estás seguro de que quieres mover el objeto siguiente?
+        [ITEM_NAME]
+		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="OutboxUploadComplete">
+		Envío al mercado finalizado.
+		<usetemplate name="okbutton" yestext="¡Hurra!"/>
+	</notification>
+	<notification name="OutboxUploadHadErrors">
+		El envío al mercado ha tenido errores. Corrige los problemas de tu buzón de salida y repite la operación. Muchas gracias.
+		<usetemplate name="okbutton" yestext="Reintentar"/>
+	</notification>
 	<notification name="CompileQueueSaveText">
 		Hubo un problema al subir el texto de un script por la siguiente razón: [REASON]. Por favor, inténtalo más tarde.
 	</notification>
@@ -2430,7 +2443,15 @@ Por favor, vuelve a intentarlo en unos momentos.
 		<form name="form">
 			<button name="Keep" text="Guardar"/>
 			<button name="Discard" text="Descartar"/>
-			<button name="Mute" text="Ignorar"/>
+			<button name="Mute" text="Ignorar al propietario"/>
+		</form>
+	</notification>
+	<notification name="OwnObjectGiveItem">
+		Tu objeto de nombre &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; te ha dado este [OBJECTTYPE]:
+&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
+		<form name="form">
+			<button name="Keep" text="Guardar"/>
+			<button name="Discard" text="Descartar"/>
 		</form>
 	</notification>
 	<notification name="UserGiveItem">
@@ -2574,6 +2595,7 @@ Si no confias en este objeto y en su creador, deberías rehusar esta petición.
 		&apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; de [NAME]
 [MESSAGE]
 		<form name="form">
+			<button name="Mute" text="Ignorar"/>
 			<button name="Ignore" text="Ignorar"/>
 		</form>
 	</notification>
@@ -2581,6 +2603,7 @@ Si no confias en este objeto y en su creador, deberías rehusar esta petición.
 		&apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; de [GROUPNAME]
 [MESSAGE]
 		<form name="form">
+			<button name="Mute" text="Ignorar"/>
 			<button name="Ignore" text="Ignorar"/>
 		</form>
 	</notification>
@@ -2906,6 +2929,12 @@ Al ocultar el botón Hablar se desactiva la función de voz.
 	<notification label="¡Tienes dólares Linden!" name="HintLindenDollar">
 		Éste es tu saldo actual de L$. Haz clic en Comprar L$ para comprar más dólares Linden.
 	</notification>
+	<notification name="LowMemory">
+		Tu bloque de memoria es insuficiente. Algunas funciones de SL se han desactivado para evitar una caída. Por favor cierra otras aplicaciones. Si el problema continúa, reinicia SL.
+	</notification>
+	<notification name="ForceQuitDueToLowMemory">
+		SL saldrá en 30 segundos porque no hay memoria suficiente.
+	</notification>
 	<notification name="PopupAttempt">
 		Se ha impedido que se abriera una ventana emergente.
 		<form name="form">
@@ -2913,6 +2942,54 @@ Al ocultar el botón Hablar se desactiva la función de voz.
 			<button name="open" text="Abrir ventana emergente"/>
 		</form>
 	</notification>
+	<notification name="SOCKS_NOT_PERMITTED">
+		El proxy SOCKS 5 &quot;[HOST]:[PORT]&quot; ha rechazado la conexión, no está permitida por el juego de reglas.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_CONNECT_ERROR">
+		El proxy SOCKS 5 &quot;[HOST]:[PORT]&quot; ha rechazado la conexión, no se ha podido abrir el canal TCP.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_NOT_ACCEPTABLE">
+		El proxy SOCKS 5 &quot;[HOST]:[PORT]&quot; ha rechazado el sistema de autenticación seleccionado.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_AUTH_FAIL">
+		El proxy SOCKS 5 &quot;[HOST]:[PORT]&quot; contestó que tus credenciales no son válidas.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_UDP_FWD_NOT_GRANTED">
+		El proxy SOCKS 5 &quot;[HOST]:[PORT]&quot; ha rechazado la petición asociada de UDP.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_HOST_CONNECT_FAILED">
+		No se pudo establecer una conexión con el servidor proxy SOCKS 5 &quot;[HOST]:[PORT]&quot;.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_UNKNOWN_STATUS">
+		Error de proxy desconocido con el servidor &quot;[HOST]:[PORT]&quot;.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_INVALID_HOST">
+		Dirección o puerto de proxy SOCKS no válidos &quot;[HOST]:[PORT]&quot;.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_BAD_CREDS">
+		Nombre de usuario o contraseña de SOCKS 5 no válidos.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="PROXY_INVALID_HTTP_HOST">
+		Dirección o puerto de proxy HTTP no válidos &quot;[HOST]:[PORT]&quot;.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="PROXY_INVALID_SOCKS_HOST">
+		Dirección o puerto de proxy SOCKS no válidos &quot;[HOST]:[PORT]&quot;.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="ChangeProxySettings">
+		La configuración del puerto se activará cuando reinicies [APP_NAME].
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="AuthRequest">
 		El sitio en &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; de la plataforma &apos;[REALM]&apos; requiere un nombre de usuario y una contraseña.
 		<form name="form">
diff --git a/indra/newview/skins/default/xui/es/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/es/panel_outbox_inventory.xml
new file mode 100644
index 0000000000..9e2f3c3adc
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_outbox_inventory.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<outbox_inventory_panel name="inventory_outbox" tool_tip="Arrastra y coloca aquí los objetos que desees preparar para venderlos en tu tienda"/>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
index 9b453fd807..3de18654b5 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
@@ -11,17 +11,6 @@
 	</text>
 	<check_box label="Personalizar el puerto" name="connection_port_enabled"/>
 	<spinner label="Nº del puerto:" name="connection_port"/>
-	<text name="cache_size_label_l">
-		Tamaño de la caché
-	</text>
-	<text name="text_box5">
-		MB
-	</text>
-	<text name="Cache location">
-		Localización de la caché:
-	</text>
-	<button label="Elegir" label_selected="Elegir" name="set_cache"/>
-	<button label="Recuperar" label_selected="Reconfigurar" name="reset_cache"/>
 	<text name="Web:">
 		Web:
 	</text>
@@ -33,12 +22,6 @@
 	<check_box initial_value="true" label="Aceptar las &apos;cookies&apos;" name="cookies_enabled"/>
 	<check_box initial_value="true" label="Activar Javascript" name="browser_javascript_enabled"/>
 	<check_box initial_value="falso" label="Permitir las ventanas emergentes en el navegador" name="media_popup_enabled"/>
-	<check_box initial_value="false" label="Activar web proxy" name="web_proxy_enabled"/>
-	<text name="Proxy location">
-		Localización del proxy:
-	</text>
-	<line_editor name="web_proxy_editor" tool_tip="Nombre o dirección IP del proxy que quieres usar"/>
-	<spinner label="Nº del puerto:" name="web_proxy_port"/>
 	<text name="Software updates:">
 		Actualizaciones de software:
 	</text>
@@ -46,4 +29,8 @@
 		<combo_box.item label="Instalar automáticamente" name="Install_automatically"/>
 		<combo_box.item label="Descargar e instalar actualizaciones manualmente" name="Install_manual"/>
 	</combo_box>
+	<text name="Proxy Settings:">
+		Configuración de proxy:
+	</text>
+	<button label="Ajustar la configuración de proxy" label_selected="Elegir" name="set_proxy"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_status_bar.xml b/indra/newview/skins/default/xui/es/panel_status_bar.xml
index ab76d3f994..0391258b75 100644
--- a/indra/newview/skins/default/xui/es/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/es/panel_status_bar.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="status">
-	<panel.string name="StatBarDaysOfWeek">
-		Domingo:Lunes:Martes:Miércoles:Jueves:Viernes:Sábado
-	</panel.string>
-	<panel.string name="StatBarMonthsOfYear">
-		Enero:Febrero:Marzo:Abril:Mayo:Junio:Julio:Agosto:Septiembre:Octubre:Noviembre:Diciembre
-	</panel.string>
 	<panel.string name="packet_loss_tooltip">
 		Pérdida de paquetes
 	</panel.string>
@@ -25,6 +19,10 @@
 		<text name="balance" tool_tip="Haz clic para actualizar tu saldo en L$" value="20 L$"/>
 		<button label="COMPRAR L$" name="buyL" tool_tip="Pulsa para comprar más L$"/>
 	</panel>
+	<combo_box name="mode_combo" tool_tip="Selecciona el modo. Elige Básico para una exploración rápida y fácil y para chatear. Elige Avanzado para tener acceso a más funciones.">
+		<combo_box.item label="Modo Básico" name="Basic"/>
+		<combo_box.item label="Modo Avanzado" name="Advanced"/>
+	</combo_box>
 	<text name="TimeText" tool_tip="Hora actual (Pacífico)">
 		24:00 AM PST
 	</text>
diff --git a/indra/newview/skins/default/xui/es/sidepanel_inventory.xml b/indra/newview/skins/default/xui/es/sidepanel_inventory.xml
index 84d19c703b..aae9bfc113 100644
--- a/indra/newview/skins/default/xui/es/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_inventory.xml
@@ -2,35 +2,47 @@
 <panel label="Cosas" name="objects panel">
 	<panel label="" name="sidepanel__inventory_panel">
 		<layout_stack name="inventory_layout_stack">
-			<layout_panel name="inbox_layout_panel">
-				<panel label="" name="marketplace_inbox">
-					<string name="InboxLabelWithArg">
-						Objetos recibidos ([NUM])
-					</string>
-					<string name="InboxLabelNoArg">
-						Objetos recibidos
-					</string>
-					<button label="Objetos recibidos" name="inbox_btn"/>
-					<text name="inbox_fresh_new_count">
-						[NUM] Nuevos
-					</text>
-					<panel tool_tip="Drag and drop items to your inventory to manage and use them">
-						<text name="inbox_inventory_placeholder">
-							Aquí se entregarán las compras realizadas en el mercado.
-						</text>
-					</panel>
-				</panel>
-			</layout_panel>
-			<layout_panel name="outbox_layout_panel">
-				<panel label="" name="marketplace_outbox">
-					<button label="Buzón de salida de comerciante" name="outbox_btn"/>
-					<button label="" name="outbox_sync_btn" tool_tip="Poner en el escaparate de Mi Mercado"/>
-					<panel tool_tip="Drag and drop items here to prepare them for sale on your storefront">
-						<text name="outbox_inventory_placeholder">
-							Configura tu cuenta de comerciante para utilizar esta función.
-						</text>
-					</panel>
-				</panel>
+			<layout_panel name="inbox_outbox_layout_panel">
+				<layout_stack name="inbox_outbox_layout_stack">
+					<layout_panel name="inbox_layout_panel">
+						<panel label="" name="marketplace_inbox">
+							<string name="InboxLabelWithArg">
+								Objetos recibidos ([NUM])
+							</string>
+							<string name="InboxLabelNoArg">
+								Objetos recibidos
+							</string>
+							<button label="Objetos recibidos" name="inbox_btn"/>
+							<text name="inbox_fresh_new_count">
+								[NUM] Nuevos
+							</text>
+							<panel tool_tip="Drag and drop items to your inventory to manage and use them">
+								<text name="inbox_inventory_placeholder">
+									Aquí se entregarán las compras realizadas en el mercado.
+								</text>
+							</panel>
+						</panel>
+					</layout_panel>
+					<layout_panel name="outbox_layout_panel">
+						<panel label="" name="marketplace_outbox">
+							<string name="OutboxLabelWithArg">
+								Buzón de salida de comerciante ([NUM])
+							</string>
+							<string name="OutboxLabelNoArg">
+								Buzón de salida de comerciante
+							</string>
+							<button label="Buzón de salida de comerciante" name="outbox_btn"/>
+							<button label="" name="outbox_sync_btn" tool_tip="Poner en el escaparate de Mi Mercado"/>
+							<panel>
+								<panel name="outbox_inventory_placeholder_panel">
+									<text name="outbox_inventory_placeholder_title">
+										Cargando...
+									</text>
+								</panel>
+							</panel>
+						</panel>
+					</layout_panel>
+				</layout_stack>
 			</layout_panel>
 		</layout_stack>
 		<panel name="button_panel">
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 2c33177ab4..cc044ba416 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -327,6 +327,18 @@ Intenta iniciar sesión de nuevo en unos instantes.
 		Aquí se puede arrastrar sólo un ítem
 	</string>
 	<string name="TooltipPrice" value="[AMOUNT] L$:"/>
+	<string name="TooltipOutboxNoTransfer">
+		Uno o varios de estos objetos no se pueden vender o transferir a otro usuario.
+	</string>
+	<string name="TooltipOutboxWorn">
+		Llevas puestos uno o más de estos objetos. Quítatelos del avatar y vuelve a intentar moverlos.
+	</string>
+	<string name="TooltipOutboxFolderLevels">
+		Esta carpeta tiene demasiados niveles de subcarpetas. Reorganiza las carpetas interiores de forma que tengas como máximo 4 niveles de profundidad (la carpeta raíz contiene A, que contiene B, que contiene C).
+	</string>
+	<string name="TooltipOutboxTooManyObjects">
+		Esta carpeta contiene más de 200 objetos. Guarda algunos objetos en una caja para disminuir su cantidad.
+	</string>
 	<string name="TooltipHttpUrl">
 		Pulsa para ver esta página web
 	</string>
@@ -1183,8 +1195,65 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="InventoryInboxNoItems">
 		Aquí se entregarán los objetos comprados en el mercado.
 	</string>
+	<string name="MarketplaceURL">
+		http://marketplace.[DOMAIN_NAME]
+	</string>
+	<string name="MarketplaceURL_CreateStore">
+		http://marketplace.[DOMAIN_NAME]/create_store
+	</string>
+	<string name="MarketplaceURL_LearnMore">
+		http://marketplace.[DOMAIN_NAME]/learn_more
+	</string>
+	<string name="InventoryOutboxCreationErrorTitle">
+		Tu Buzón de salida de comerciante no está configurado correctamente
+	</string>
+	<string name="InventoryOutboxCreationErrorTooltip">
+		Error de configuración del Buzón de salida de comerciante
+	</string>
+	<string name="InventoryOutboxCreationError">
+		Ponte en contacto con el servicio de atención al cliente para resolver el problema.
+	</string>
+	<string name="InventoryOutboxNotMerchantTitle">
+		Cualquiera puede vender objetos en el mercado
+	</string>
+	<string name="InventoryOutboxNotMerchantTooltip">
+		¡Hazte comerciante!
+	</string>
+	<string name="InventoryOutboxNotMerchant">
+		[[MARKETPLACE_URL] El Mercado de Second Life] pone en venta más de un millón de productos virtuales, todos ellos creados por residentes. Tú también puedes vender los objetos que crees, así como algunos de los objetos que hayas comprado. Es fácil y es gratuito. [[LEARN_MORE_URL] Más información] o [[CREATE_STORE_URL] crea una tienda] en el mercado para empezar.
+	</string>
+	<string name="InventoryOutboxNoItemsTitle">
+		Una nueva forma para enviar objetos al mercado
+	</string>
+	<string name="InventoryOutboxNoItemsTooltip">
+		Arrastra y coloca aquí los objetos que desees preparar para venderlos en el mercado
+	</string>
 	<string name="InventoryOutboxNoItems">
-		Arrastra objetos aquí para preparar una lista del escaparate de tu mercado.
+		Arrastra a esta zona los objetos o carpetas que desees vender. Aparecerá una copia del objeto, sin quitarlo de tu inventario, salvo que el objeto arrastrado sea &quot;no copiable&quot;. Cuando estés listo para enviar los objetos al mercado, pulsa en el botón Subir. Cuando se hayan trasladado los objetos a tu inventario en el mercado, desaparecerán de esta carpeta.
+	</string>
+	<string name="Marketplace Error None">
+		Sin errores
+	</string>
+	<string name="Marketplace Error Not Merchant">
+		Error: Para poder enviar objetos al mercado, debes registrarte como comerciante (es gratis).
+	</string>
+	<string name="Marketplace Error Empty Folder">
+		Error: Esta carpeta está vacía.
+	</string>
+	<string name="Marketplace Error Unassociated Products">
+		Error: Este objeto no se pudo subir porque tu cuenta de comerciante tiene demasiados objetos que no están asociados a productos. Para corregirlo, inicia sesión en la página web del mercado y asocia más objetos.
+	</string>
+	<string name="Marketplace Error Object Limit">
+		Error: Este elemento contiene demasiados objetos. Para corregir el error, guarda objetos en cajas de forma que el total de objetos sea menor que 200.
+	</string>
+	<string name="Marketplace Error Folder Depth">
+		Error: Este objeto contiene demasiados niveles de carpetas anidadas. Reorganízalo de forma que tenga como máximo 3 niveles de carpetas anidadas.
+	</string>
+	<string name="Marketplace Error Unsellable Item">
+		Error: Este objeto no se puede vender en el mercado.
+	</string>
+	<string name="Marketplace Error Internal Import">
+		Error: Este objeto tiene un problema. Vuelve a intentarlo más tarde.
 	</string>
 	<string name="no_transfer" value="(no transferible)"/>
 	<string name="no_modify" value="(no modificable)"/>
@@ -4089,8 +4158,8 @@ Denuncia de infracción
 	<string name="Female - Wow">
 		Mujer - Admiración
 	</string>
-	<string name="/bow">
-		/reverencia
+	<string name="/bow1">
+		/reverencia1
 	</string>
 	<string name="/clap">
 		/aplaudir
diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml
index e3e3169161..d088cb3244 100644
--- a/indra/newview/skins/default/xui/fr/floater_about.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about.xml
@@ -42,15 +42,23 @@ Version serveur vocal : [VOICE_VERSION]
 			<button label="Copier dans le presse-papiers" name="copy_btn"/>
 		</panel>
 		<panel label="Remerciements" name="credits_panel">
-			<text_editor name="credits_editor">
-				Second Life existe grâce aux efforts de Philip, Tessa, Andrew, Cory, Ian, James, Phoenix, Ryan, Haney, Dan, Char, Ben, John, Tanya, Eddie, Richard, Mitch, Doug, Eric, Frank, Bruce, Aaron, Peter, Alice, Charlie, Debra, Eileen, Helen, Janet, Steffan, Steve, Tom, Mark, Hunter, Xenon, Burgess, Bill, Jim, Lee, Hamlet, Daniel, Jeff, Todd, Sarah, Tim, Stephanie, Colin, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Jack, Vektor, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Jesse, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Yuko, Makiko, Thomas, Harry, Seth, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Brad, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, Beez, Milo, Hermia, Red, Thrax, Gulliver, Joe, Sally, Paul, Jose, Rejean, Dore, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, Dustin, George, Del, Matthew, Cat, Jacqui, Adrian, Viola, Alfred, Noel, Irfan, Yool, Rika, Jane, Frontier, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Jeremy, JP, Jake, Anthony, Maurice, Madhavi, Leopard, Kyle, Joon, Bert, Belinda, Jon, Kristi, Bridie, Pramod, Socrates, Maria, Aric, Adreanne, Jay, Kari, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Colossus, Zen, BigPapi, Pastrami, Kurz, Mani, Neuro, Mel, Sardonyx, MJ, Rowan, Sgt, Elvis, Samuel, Leo, Bryan, Niko, Austin, Soft, Poppy, Rachel, Aki, Banzai, Alexa, Sue, Bender, CG, Angelo, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Rothman, Niall, Marin, Allison, Katie, Dawn, Dusty, Katt, Judy, Andrea, Ambroff, Infinity, Rico, Gail, Kalpana, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Maestro, Simone, Yang, T, Shannon, Nelson, Khanh, Scott, Courtney, Charlene, Quixote, Susan, Zed, Amanda, Katelin, Enkidu, Roxie, Esbee, JoRoan, Scarlet, Tay, Kevin, Wolfgang, Johnny, Ray, Andren, Merov, Bob, Rand, Howard, Callen, Heff, Galen, Newell, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl, Ashley, JessieAnn, Huseby, Karina, Paris, Kurt, Rick, Lis, Kotler, Theeba, Lynx, Murphy, Doten, Taka, Norm, Jillian, Marcus, Mae, Novack, Esther, Perry, Dana, Ducot, Javier, Porter, Madison, Gecko, Dough, JR, Gisele, Crimp, Norie, Arch, Kimi, Fisher, Barbara, Jason, Peggy, Bernard, Jules, Leroy, Eva, Khederian, Campbell, Vogt, Masido, Karel, Torres, Lo, Breezer, Delby, Rountree, Anna, Servus, Rue, Itiaes, Chuck, Luna, Novella, Zaza, Wen, Gino, Lex, Cassandra, Limey, Nancy, Anukul, Silver, Brodesky, Jinsai, Squid, Gez, Rakesh, Ladan, Edelman, Marcet, Squire, Tatem, Tony, Jerm, Tia, Falcon, BK, Tiggs, Driscoll, Bacon, Timothee, Cru, Carmilla, Coyot, Webb, Kazu, Rudas, LJ, Sea, Ali Wallace, Bewest, Pup, Drub, Dragon, Inoshiro, Byron, Rhett, Xandix, Aimee, Fredrik, Thor, Teddy, Baron, Nelly, Ghengis, Epic, Eli, Stone, Grapes, Irie, Prep, Scobu, Valerie, Alain et bien d&apos;autres.
-
-Tous nos remerciements aux résidents suivants pour avoir testé cette version (la meilleure qui soit jusqu&apos;à présent) : Drew Dwi, Zai Lynch, Latif Khalifa, Ellla McMahon, Harleen Gretzky, Squirrel Wood, Malarthi Behemoth, Dante Tucker, Buckaroo Mu, Eddi Decosta, Dirk, Talamasca, Torben Trautman, Irene Muni, Aralara Rajal, Aura Dirval, Cayu Cluny, Eva Rau, FreeSL Aeon, Frontera Thor, Inma Rau, Lunita Savira, Minerva Memel, Polo Gufler, Xiki Luik, Lilly Zenovka, Vick Forcella, Sasy Scarborough, Gentle Welinder, Elric Anatine, Techwolf Lupindo, Dusan Writer, WolfPup Lowenhar, Marianne McCann, Fiachra Lach, Sitearm Madonna, Sudane Erato, Sahkolihaa Contepomi, Sachi Vixen, Questar Utu, Dimitrio Lewis, Matto Destiny, Scrim Pinion, Radio Signals, Psi Merlin, Pixel Gausman, Mel Vanbeeck, Laurent Bechir, Lamorna Proctor, Lares Carter, Gwyneth Llewelyn, Hydra Shaftoe, Holger Gilruth, Gentle Heron, Carla Broek, Boroondas Gupte, Fury Rosewood, Flower Ducatillon, Colpo Wexler, gwampa Lomu, Borg Capalini, Beansy Twine, Ardy Lay, , 45ms Zhong, Adeon Writer, Aeonix Aeon, Ai Austin, Aiko Ying, Alexandrea Fride, Alliez Mysterio, Annie Milestone, Annika Genezzia, Ansariel Hiller, ArminasX Saiman, Arya Braveheart, Asaeda Meltingdots, Asturkon Jua, Avallyn Oakleaf, Avatar Quinzet, BabyA Littlething, Bacchus Ireto, Bazaar, Riva, Benjamin Bigdipper, Beth Walcher, Bezilon Kasei, Biancaluce Robbiani, Bill Walach, blakopal Galicia, Blitzckreed Levenque, Bryn Oh, Callipygian Christensen, Cap Carver, Carr Arbenlow, Chantal Harvey, Charles Courtois, Charlie Sazaland, Cherry Cheevers, ChickyBabes Zuzu, Christopher  Organiser, Ciaran Laval, Clara Young, Celierra Darling, Corinne Helendale, Corro Moseley, Coughdrop Littlething, Darien Caldwell, Dartagan Shepherd, Debs Regent, Decro Schmooz, Denim Kamachi, DiJodi Dubratt, Dil Spitz, Edgware Marker, Egehan Dryke, Emma Portilo, Emmie Fairymeadow, Evangelista Emerald, Faelon Swordthain, Frenchimmo Sabra, Gaberoonie Zanzibar, Ganymedes Costagravas, Gene Frostbite, GeneJ Composer, Giggles Littlebird, Grady Echegaray, Guni Greenstein, Gypsy Tripsa, Hackshaven Harford, Ham Rambler, Han Shuffle, Hanglow Short, Hatzfeld Runo, herina Bode, Horatio Freund, Hypatia Callisto, Hypatia Pickens, Identity Euler, Imnotgoing Sideways, Innula Zenovka, Iyoba Tarantal, Jack Abraham, Jagga Meredith, Jennifer Boyle, Jeremy Marquez, Jessica Qin, Jinx Nordberg, Jo Bernandes, Jocial Sonnenkern, Joel Savard, Jondan Lundquist, Josef Munster, Josette Windlow, Juilan Tripsa, Juro Kothari, Justin RiversRunRed, Kagehi Kohn, Kaimen Takahe, Keklily Longfall, Ken Lavender, Kestral Karas, Khisme Nitely, Kimar Coba, Kithrak Kirkorian, Kitty Barnett, Kolor Fall, Komiko Okamoto, Korvel Noh, Larry Pixel, Leal Choche, len Starship, Lenae Munz, Lexi Frua, Lillie Cordeaux, Lizzy Macarthur, LSL Scientist, Luban Yiyuan, Luc Starsider, Maccus McCullough, Madison Blanc, Maggie Darwin, Mallory Destiny, Manx Wharton, Marc Claridge, Marc2 Sands, Matthew Anthony, Maxim RiversRunRed, Medhue Simoni, Melinda Latynina, Mencius Watts, Michi Lumin, Midian Farspire, Miles Glaz, Mindy Mathy, Mitch Wagner, Mo Hax, Mourna Biziou, Nao Noe, naofan Teardrop, Naomah Beaumont, Nathiel Siamendes, Nber Medici, Neko Link, Netpat Igaly, Neutron Chesnokov, Newfie Pendragon, Nicholai Laviscu, Nick Rhodes, Nicoladie Gymnast, Ollie Kubrick, Orenj Marat, Orion Delphis, Oryx Tempel, Parvati Silverweb, PeterPunk Mooney, Pixel Scientist, Pounce Teazle, Professor Noarlunga, Quantum Destiny, Quicksilver Hermes, Ralf Setsuko, RAT Quan, RedMokum Bravin, Revolution Perenti, Rezit Sideways, Rich Grainger, Rosco Teardrop, Rose Evans, Rudee Voom, RufusTT Horsefly, Saii Hallard, SaintLEOlions Zimer, Samm Larkham, Satanello Miami, SexySteven Morrisey, Sheet Spotter, Shnurui Troughton, sicarius Thorne, Sicarius Toxx, Sini Nubalo, SLB Wirefly, snowy Sidran, Soupa Segura, ST Mensing, Starshine Halasy, Stickman Ingmann, Synystyr Texan, Takeda Terrawyng, Tali Rosca, Templar Merlin, Tezcatlipoca Bisiani, Tiel Stonecutter, Tony Kembia, TouchaHoney Perhaps, Trey Reanimator, TriloByte Zanzibar, Trinity Dechou, Trinity Dejavu, Unlikely Quintessa, UsikuFarasi Kanarik, Veritas Raymaker, Vex Streeter, Viaticus Speculaas, Villain Baroque, Vixie Durant, Void Singer, Watty Berkson, Westley Schridde, Westley Streeter, Whimsy Winx, Winter Ventura, Wundur Primbee, xstorm Radek, YongYong Francois, Zak Westminster, Zana Kohime, Zaren Alexander, Zeja Pyle, ZenMondo Wormser, Zoex Flanagan et bien d&apos;autres.
-
-
-
-
-« Le travail continue, la cause demeure, l&apos;espoir vit encore et le rêve ne mourra jamais » - Edward Kennedy
+			<text name="linden_intro">
+				Second Life vous est proposé par les Linden :
+			</text>
+			<text_editor name="linden_names">
+				Philip, Andrew, Doug, Richard, Phoenix, Ian, Mark, Robin, Dan, Char, Ryan, Eric, Jim, Lee, Jeff, Michael, Kelly, Steve, Catherine, Bub, Ramzi, Jill, Jeska, Don, Kona, Callum, Charity, Jack, Shawn, babbage, James, Lauren, Blue, Brent, Reuben, Pathfinder, Jesse, Patsy, Torley, Bo, Cyn, Jonathan, Gia, Annette, Ginsu, Harry, Lex, Runitai, Guy, Cornelius, Beth, Swiss, Thumper, Wendy, Teeple, Seth, Dee, Mia, Sally, Liana, Aura, Beez, Milo, Red, Gulliver, Marius, Joe, Jose, Dore, Justin, Nora, Morpheus, Lexie, Amber, Chris, Xan, Leyla, Walker, Sabin, Joshua, Hiromi, Tofu, Fritz, June, Jean, Ivy, Dez, Ken, Betsy, Which, Spike, Rob, Zee, Dustin, George, Claudia, del, Matthew, jane, jay, Adrian, Yool, Rika, Yoz, siobhan, Qarl, Benjamin, Beast, Everett, madhavi, Christopher, Izzy, stephany, Jeremy, sean, adreanne, Pramod, Tobin, sejong, Iridium, maurice, kj, Meta, kari, JP, bert, kyle, Jon, Socrates, Bridie, Ivan, maria, Aric, Coco, Periapse, sandy, Storrs, Lotte, Colossus, Brad, Pastrami, Zen, BigPapi, Banzai, Sardonyx, Mani, Garry, Jaime, Neuro, Samuel, Niko, CeeLo, Austin, Soft, Poppy, emma, tessa, angelo, kurz, alexa, Sue, CG, Blake, Erica, Brett, Bevis, kristen, Q, simon, Enus, MJ, laurap, Kip, Scouse, Ron, Ram, kend, Marty, Prospero, melissa, kraft, Nat, Seraph, Hamilton, Lordan, Green, miz, Ashlei, Trinity, Ekim, Echo, Charlie, Rowan, Rome, Jt, Doris, benoc, Christy, Bao, Kate, Tj, Patch, Cheah, Johan, Brandy, Angela, Oreh, Cogsworth, Lan, Mitchell, Space, Bambers, Einstein, Bender, Malbers, Matias, Maggie, Rothman, Milton, Niall, Marin, Allison, Mango, Andrea, Katt, Yi, Ambroff, Rico, Raymond, Gail, Christa, William, Dawn, Usi, Dynamike, M, Corr, Dante, Molly, kaylee, Danica, Kelv, Lil, jacob, Nya, Rodney, elsie, Blondin, Grant, Nyx, Devin, Monty, Minerva, Keira, Katie, Jenn, Makai, Clare, Joy, Cody, Gayathri, FJ, spider, Oskar, Landon, Jarv, Noelle, Al, Doc, Gray, Vir, t, Maestro, Simone, Shannon, yang, Courtney, Scott, charlene, Quixote, Susan, Zed, Amanda, Katelin, Esbee, JoRoan, Enkidu, roxie, Scarlet, Merov, Kevin, Judy, Rand, Newell, Les, Dessie, Galen, Michon, Geo, Siz, Calyle, Pete, Praveen, Callen, Sheldon, Pink, Nelson, jenelle, Terrence, Nathan, Juan, Sascha, Huseby, Karina, Kaye, Kotler, Lis, Darv, Charrell, Dakota, Kimmora, Theeba, Taka, Mae, Perry, Ducot, dana, Esther, Dough, gisele, Doten, Viale, Fisher, jessieann, ashley, Torres, delby, rountree, kurt, Slaton, Madison, Rue, Gino, Wen, Casssandra, Brodesky, Squid, Gez, Rakesh, Gecko, Ladan, Tony, Tatem, Squire, Falcon, BK, Crimp, Tiggs, Bacon, Coyot, Carmilla, Webb, Sea, Arch, Jillian, Jason, Bernard, Vogt, Peggy, dragon, Pup, xandix, Wallace, Bewest, Inoshiro, Rhett, AG, Aimee, Ghengis, Itiaes, Eli, Steffan, Epic, Grapes, Stone, Prep, Scobu, Robert, Alain, Carla, Vicky, Tia, Alec, Taras, Lisa, Oz, Ariane, Log, House, Kazu, Kim, Drofnas, Tyler, Campbell, Michele, Madeline, Nelly, Baron, Thor, Lori, Hele, Fredrik, Teddy, Pixie, Berry, Gabrielle, Alfonso, Brooke, Wolf, Ringo, Cru, Charlar, Rodvik, Gibson, Elise, Bagman, Greger, Leonidas, Jerm, Leslie, CB, Brenda, Durian, Carlo, mm, Zeeshan, Caleb, Max, Elikak, Mercille, Steph, Chase
+			</text_editor>
+			<text name="contrib_intro">
+				Contributions Open Source :
+			</text>
+			<text_editor name="contrib_names">
+				Dummy Name remplacé au moment de l&apos;exécution
+			</text_editor>
+			<text name="trans_intro">
+				Participation aux traductions :
+			</text>
+			<text_editor name="trans_names">
+				Dummy Name remplacé au moment de l&apos;exécution
 			</text_editor>
 		</panel>
 		<panel label="Licences" name="licenses_panel">
diff --git a/indra/newview/skins/default/xui/fr/floater_model_preview.xml b/indra/newview/skins/default/xui/fr/floater_model_preview.xml
index 2639339be5..2b8e441ef0 100644
--- a/indra/newview/skins/default/xui/fr/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_model_preview.xml
@@ -131,7 +131,7 @@ Serveur :
 			<button label="Parcourir..." name="lod_browse"/>
 			<combo_box name="lod_mode">
 				<combo_item name="triangle_limit">
-					Limite du triangle
+					Triangles max.
 				</combo_item>
 				<combo_item name="error_threshold">
 					Seuil d&apos;erreur
@@ -141,7 +141,7 @@ Serveur :
 				Opér. construction :
 			</text>
 			<text name="queue_mode_text">
-				Mode fil d&apos;attente :
+				Mode file d&apos;attente :
 			</text>
 			<combo_box name="build_operator">
 				<combo_item name="edge_collapse">
@@ -244,7 +244,7 @@ Serveur :
 		Frais de chargement : [FEE] L$
 	</text>
 	<button label="Réinitialiser" name="reset_btn" tool_tip="Rétablir les paramètres par défaut."/>
-	<button label="Calculer les poids et les frais" name="calculate_btn" tool_tip="Calculer les poids et les frais."/>
+	<button label="Calculer poids et frais" name="calculate_btn" tool_tip="Calculer les poids et les frais."/>
 	<button label="Charger" name="ok_btn" tool_tip="Charger dans le simulateur."/>
 	<button label="Annuler" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/fr/floater_preferences_proxy.xml
new file mode 100644
index 0000000000..020bdf928b
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_preferences_proxy.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Proxy Settings Floater" title="Paramètres de proxy">
+	<check_box initial_value="false" label="Utiliser le proxy HTTP pour les pages Web" name="web_proxy_enabled"/>
+	<text name="http_proxy_label">
+		Proxy HTTP :
+	</text>
+	<line_editor name="web_proxy_editor" tool_tip="Nom DNS ou adresse IP du proxy HTTP que vous souhaitez utiliser."/>
+	<spinner label="Numéro de port :" name="web_proxy_port" tool_tip="Port du proxy HTTP que vous souhaitez utiliser."/>
+	<check_box label="Utiliser le proxy SOCKS 5 pour le trafic UDP" name="socks_proxy_enabled"/>
+	<text name="socks5_proxy_label">
+		Proxy SOCKS 5 :
+	</text>
+	<line_editor name="socks_proxy_editor" tool_tip="Nom DNS ou adresse IP du proxy SOCKS 5 que vous souhaitez utiliser."/>
+	<spinner label="Numéro de port :" name="socks_proxy_port" tool_tip="Port du proxy SOCKS 5 que vous souhaitez utiliser."/>
+	<text name="socks_auth_label">
+		Authentification SOCKS :
+	</text>
+	<radio_group name="socks5_auth_type">
+		<radio_item label="Aucune authentification" name="Socks5NoAuth" tool_tip="Aucune authentification requise pour le proxy SOCKS 5." value="Aucune"/>
+		<radio_item label="Nom d&apos;utilisateur/Mot de passe" name="Socks5UserPass" tool_tip="Authentification par nom d&apos;utilisateur/mot de passe requise pour le proxy SOCKS 5." value="UserPass"/>
+	</radio_group>
+	<text name="socks5_username_label">
+		Nom d&apos;utilisateur :
+	</text>
+	<text name="socks5_password_label">
+		Mot de passe :
+	</text>
+	<line_editor name="socks5_username" tool_tip="Nom d&apos;utilisateur d&apos;authentification avec votre serveur SOCKS 5."/>
+	<line_editor name="socks5_password" tool_tip="Mot de passe d&apos;authentification avec votre serveur SOCKS 5."/>
+	<text name="other_proxy_label">
+		Autre proxy de trafic HTTP :
+	</text>
+	<radio_group name="other_http_proxy_type">
+		<radio_item label="Pas de proxy" name="OtherNoProxy" tool_tip="Le trafic HTTP hors Web ne sera PAS envoyé à un proxy." value="Aucun"/>
+		<radio_item label="Utiliser le proxy HTTP" name="OtherHTTPProxy" tool_tip="Le trafic HTTP hors Web sera envoyé via le proxy Web configuré." value="Web"/>
+		<radio_item label="Utiliser le proxy SOCKS 5" name="OtherSocksProxy" tool_tip="Le trafic HTTP hors Web sera envoyé via le proxy SOCKS 5 configuré." value="Socks"/>
+	</radio_group>
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory.xml b/indra/newview/skins/default/xui/fr/menu_inventory.xml
index fa0e264d14..53df8d11da 100644
--- a/indra/newview/skins/default/xui/fr/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/menu_inventory.xml
@@ -83,5 +83,7 @@
 	<menu_item_call label="Modifier" name="Wearable Edit"/>
 	<menu_item_call label="Ajouter" name="Wearable Add"/>
 	<menu_item_call label="Enlever" name="Take Off"/>
+	<menu_item_call label="Copier vers la boîte d&apos;envoi vendeur" name="Merchant Copy"/>
+	<menu_item_call label="Déplacer vers la boîte d&apos;envoi vendeur" name="Merchant Move"/>
 	<menu_item_call label="--aucune option--" name="--no options--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_media_ctrl.xml b/indra/newview/skins/default/xui/fr/menu_media_ctrl.xml
index 787a5b3af2..1941ad2cbf 100644
--- a/indra/newview/skins/default/xui/fr/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/fr/menu_media_ctrl.xml
@@ -3,4 +3,5 @@
 	<menu_item_call label="Couper" name="Cut"/>
 	<menu_item_call label="Copier" name="Copy"/>
 	<menu_item_call label="Coller" name="Paste"/>
+	<menu_item_call label="Ouvrir l&apos;inspecteur Web" name="open_webinspector"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_mode_change.xml b/indra/newview/skins/default/xui/fr/menu_mode_change.xml
new file mode 100644
index 0000000000..982a331c5b
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_mode_change.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Mode Change">
+	<menu_item_check label="Basique" name="BasicMode"/>
+	<menu_item_check label="Avancé" name="AdvancedMode"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 46adc79a00..cf1dac2f3a 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -138,7 +138,6 @@
 			<menu_item_call label="Son ([COST] L$)..." name="Upload Sound"/>
 			<menu_item_call label="Animation ([COST] L$)..." name="Upload Animation"/>
 			<menu_item_call label="Modèle..." name="Upload Model"/>
-			<menu_item_call label="Assistant Modèle..." name="Upload Model Wizard"/>
 			<menu_item_call label="Lot ([COST] L$ par fichier)..." name="Bulk Upload"/>
 		</menu>
 		<menu_item_call label="Annuler" name="Undo"/>
@@ -253,6 +252,7 @@
 			<menu_item_check label="Afficher les matrices" name="Show Matrices"/>
 			<menu_item_check label="Afficher la couleur sous le curseur" name="Show Color Under Cursor"/>
 			<menu_item_check label="Afficher la mémoire" name="Show Memory"/>
+			<menu_item_check label="Afficher les infos de mémoire privées" name="Show Private Mem Info"/>
 			<menu_item_check label="Afficher les mises à jour des objets" name="Show Updates"/>
 		</menu>
 		<menu label="Forcer une erreur" name="Force Errors">
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index ef95a1a389..1389c49f5b 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -85,6 +85,19 @@ Veuillez vérifier votre connexion Internet.
 		Enregistrer les changements dans la partie du corps/les habits actuels ?
 		<usetemplate canceltext="Cancel" name="yesnocancelbuttons" notext="Ne pas enregistrer" yestext="Enregistrer"/>
 	</notification>
+	<notification name="ConfirmNoCopyToOutbox">
+		Vous n&apos;êtes pas autorisé à copier cet article dans la boîte d&apos;envoi vers la Place du marché. Voulez-vous vraiment déplacer l&apos;article suivant ?
+        [ITEM_NAME]
+		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="OutboxUploadComplete">
+		Chargement sur la Place du marché terminé.
+		<usetemplate name="okbutton" yestext="Hourra !"/>
+	</notification>
+	<notification name="OutboxUploadHadErrors">
+		Chargement sur la Place du marché effectué avec des erreurs ! Corrigez les problèmes dans votre boîte d&apos;envoi et réessayez. Merci !
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="CompileQueueSaveText">
 		Une erreur est survenue lors du chargement du texte pour un script, suite au problème suivant : [REASON]. Veuillez réessayer ultérieurement.
 	</notification>
@@ -2422,7 +2435,15 @@ Veuillez réessayer dans quelques minutes.
 		<form name="form">
 			<button name="Keep" text="Garder"/>
 			<button name="Discard" text="Jeter"/>
-			<button name="Mute" text="Ignorer"/>
+			<button name="Mute" text="Ignorer le propriétaire"/>
+		</form>
+	</notification>
+	<notification name="OwnObjectGiveItem">
+		Votre objet nommé &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; vous a donné un objet de type [OBJECTTYPE] :
+&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
+		<form name="form">
+			<button name="Keep" text="Garder"/>
+			<button name="Discard" text="Jeter"/>
 		</form>
 	</notification>
 	<notification name="UserGiveItem">
@@ -2566,6 +2587,7 @@ Accepter cette requête ?
 		&lt;nolink&gt;[TITLE]&lt;/nolink&gt; de [NAME]
 [MESSAGE]
 		<form name="form">
+			<button name="Mute" text="Ignorer"/>
 			<button name="Ignore" text="Ignorer"/>
 		</form>
 	</notification>
@@ -2573,6 +2595,7 @@ Accepter cette requête ?
 		&lt;nolink&gt;[TITLE]&lt;/nolink&gt; de [GROUPNAME]
 [MESSAGE]
 		<form name="form">
+			<button name="Mute" text="Ignorer"/>
 			<button name="Ignore" text="Ignorer"/>
 		</form>
 	</notification>
@@ -2902,6 +2925,12 @@ Cliquez sur un point dans le monde et faites glisser votre souris pour faire tou
 	<notification label="Vous possédez des Linden dollars !" name="HintLindenDollar">
 		Votre solde actuel en L$ est celui-ci. Pour y ajouter d&apos;autres Linden dollars, cliquez sur Acheter L$.
 	</notification>
+	<notification name="LowMemory">
+		Pool de mémoire faible. Certaines fonctions de SL ont été désactivées afin d&apos;éviter un plantage. Veuillez fermer les autres applications. Si le problème persiste, redémarrez SL.
+	</notification>
+	<notification name="ForceQuitDueToLowMemory">
+		Mémoire insuffisante : fermeture de SL dans 30 secondes.
+	</notification>
 	<notification name="PopupAttempt">
 		Impossible d&apos;ouvrir une fenêtre popup.
 		<form name="form">
@@ -2909,6 +2938,54 @@ Cliquez sur un point dans le monde et faites glisser votre souris pour faire tou
 			<button name="open" text="Ouvrir la fenêtre popup"/>
 		</form>
 	</notification>
+	<notification name="SOCKS_NOT_PERMITTED">
+		Le proxy SOCKS 5 &quot;[HOST]:[PORT]&quot; a refusé la connexion, non autorisée par le jeu de règles défini.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_CONNECT_ERROR">
+		Le proxy SOCKS 5 &quot;[HOST]:[PORT]&quot; a refusé la connexion. Impossible d&apos;ouvrir le canal TCP.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_NOT_ACCEPTABLE">
+		Le proxy SOCKS 5 &quot;[HOST]:[PORT]&quot; a refusé le système d&apos;authentification sélectionné.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_AUTH_FAIL">
+		Le proxy SOCKS 5 &quot;[HOST]:[PORT]&quot; indique que vos identifiants ne sont pas valides.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_UDP_FWD_NOT_GRANTED">
+		Le proxy SOCKS 5 &quot;[HOST]:[PORT]&quot; a refusé la demande d&apos;association UDP (UDP ASSOCIATE).
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_HOST_CONNECT_FAILED">
+		Connexion au serveur de proxy SOCKS 5 &quot;[HOST]:[PORT]&quot; impossible.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_UNKNOWN_STATUS">
+		Erreur de proxy inconnue avec le serveur &quot;[HOST]:[PORT]&quot;.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_INVALID_HOST">
+		Adresse ou port &quot;[HOST]:[PORT]&quot; de proxy SOCKS non valide.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_BAD_CREDS">
+		Nom d&apos;utilisateur ou mot de passe SOCKS 5 non valide.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="PROXY_INVALID_HTTP_HOST">
+		Adresse ou port &quot;[HOST]:[PORT]&quot; de proxy HTTP non valide.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="PROXY_INVALID_SOCKS_HOST">
+		Adresse ou port &quot;[HOST]:[PORT]&quot; de proxy SOCKS non valide.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="ChangeProxySettings">
+		Les paramètres de proxy seront appliqués au redémarrage de [APP_NAME].
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="AuthRequest">
 		Nom d&apos;utilisateur et mot de passe requis pour le site se trouvant à l&apos;emplacement suivant : &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos;, domaine &apos;[REALM]&apos;.
 		<form name="form">
diff --git a/indra/newview/skins/default/xui/fr/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/fr/panel_outbox_inventory.xml
new file mode 100644
index 0000000000..d947dbceb8
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_outbox_inventory.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<outbox_inventory_panel name="inventory_outbox" tool_tip="Glisser-déposer des articles ici afin de les préparer à la vente sur votre vitrine."/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
index e9e6e6350f..1644eefbee 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
@@ -8,7 +8,7 @@
 		<radio_item label="Moyenne" name="radio2" value="1"/>
 		<radio_item label="Grande" name="radio3" value="2"/>
 	</radio_group>
-	<check_box initial_value="true" label="Jouer l&apos;animation clavier quand vous écrivez" name="play_typing_animation"/>
+	<check_box initial_value="true" label="Exécuter l&apos;animation clavier quand vous écrivez" name="play_typing_animation"/>
 	<check_box label="M&apos;envoyer les IM par e-mail une fois déconnecté" name="send_im_to_email"/>
 	<check_box label="Activer l&apos;historique des chats et des IM en texte brut" name="plain_text_chat_history"/>
 	<check_box label="Bulles de chat" name="bubble_text_chat"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
index 5bf2ef72f5..a738b2d43f 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -51,7 +51,7 @@
 			<combo_box.item label="Tous les objets et avatars" name="3"/>
 			<combo_box.item label="Tout" name="4"/>
 		</combo_box>
-		<slider label="Propriétés physiques de l&apos;avatar :" name="AvatarPhysicsDetail"/>
+		<slider label="Prop. physiques avatar :" name="AvatarPhysicsDetail"/>
 		<text name="AvatarPhysicsDetailText">
 			Faible
 		</text>
@@ -102,8 +102,8 @@
 			Rendu du terrain :
 		</text>
 		<radio_group name="TerrainDetailRadio">
-			<radio_item label="Bas" name="0"/>
-			<radio_item label="Haut" name="2"/>
+			<radio_item label="Faible" name="0"/>
+			<radio_item label="Élevé" name="2"/>
 		</radio_group>
 		--&gt;
 	</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml
index 202ec779f5..3123a4c6fe 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml
@@ -3,9 +3,9 @@
 	<panel.string name="log_in_to_change">
 		se connecter pour changer
 	</panel.string>
-	<button label="Vider le cache" name="clear_cache" tool_tip="Effacer l&apos;image de connexion, le dernier lieu, l&apos;historique des téléportations et la texture du cache."/>
+	<button label="Vider l'historique" name="clear_cache" tool_tip="Effacer le cache de l&apos;image de connexion, du dernier lieu, de l&apos;historique des téléportations, Web et de texture."/>
 	<text name="cache_size_label_l">
-		(Endroits, images, web, historique des recherches)
+		(endroits, images, web, historique des recherches)
 	</text>
 	<check_box label="M&apos;afficher dans les résultats de recherche" name="online_searchresults"/>
 	<check_box label="Seuls mes amis et groupes voient quand je suis en ligne" name="online_visibility"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
index bfe0defd56..82780c27c5 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
@@ -11,17 +11,6 @@
 	</text>
 	<check_box label="Port de connexion" name="connection_port_enabled"/>
 	<spinner label="Numéro :" name="connection_port"/>
-	<text name="cache_size_label_l">
-		Taille de la mémoire
-	</text>
-	<text name="text_box5">
-		Mo
-	</text>
-	<text name="Cache location">
-		Emplacement du cache :
-	</text>
-	<button label="Parcourir" label_selected="Parcourir" name="set_cache"/>
-	<button label="Réinitialiser" label_selected="Réinitialiser" name="reset_cache"/>
 	<text name="Web:">
 		Web :
 	</text>
@@ -33,12 +22,6 @@
 	<check_box initial_value="true" label="Accepter les cookies" name="cookies_enabled"/>
 	<check_box initial_value="true" label="Activer Javascript" name="browser_javascript_enabled"/>
 	<check_box initial_value="false" label="Activer les fenêtres popup de navigateur de médias" name="media_popup_enabled"/>
-	<check_box initial_value="false" label="Activer le proxy Web" name="web_proxy_enabled"/>
-	<text name="Proxy location">
-		Emplacement du proxy :
-	</text>
-	<line_editor name="web_proxy_editor" tool_tip="Le nom ou adresse IP du proxy que vous souhaitez utiliser"/>
-	<spinner label="Numéro de port :" label_width="95" name="web_proxy_port" width="170"/>
 	<text name="Software updates:">
 		Mises à jour logicielles :
 	</text>
@@ -46,4 +29,8 @@
 		<combo_box.item label="Installation automatique" name="Install_automatically"/>
 		<combo_box.item label="Téléchargement et installation manuels" name="Install_manual"/>
 	</combo_box>
+	<text name="Proxy Settings:">
+		Paramètres de proxy :
+	</text>
+	<button label="Définir" label_selected="Parcourir" name="set_proxy"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_status_bar.xml b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
index 69aec99e1d..2dd5c06e4d 100644
--- a/indra/newview/skins/default/xui/fr/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="status">
-	<panel.string name="StatBarDaysOfWeek">
-		Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday
-	</panel.string>
-	<panel.string name="StatBarMonthsOfYear">
-		January:February:March:April:May:June:July:August:September:October:November:December
-	</panel.string>
 	<panel.string name="packet_loss_tooltip">
 		Perte de paquets
 	</panel.string>
@@ -25,6 +19,10 @@
 		<text name="balance" tool_tip="Cliquer sur ce bouton pour actualiser votre solde en L$." value="20 L$"/>
 		<button label="ACHETER L$" name="buyL" tool_tip="Cliquer pour acheter plus de L$"/>
 	</panel>
+	<combo_box name="mode_combo" tool_tip="Sélectionnez un mode. Pour une exploration facile et rapide avec chat, choisissez Basique. Pour accéder à plus de fonctionnalités, choisissez Avancé.">
+		<combo_box.item label="Mode basique" name="Basic"/>
+		<combo_box.item label="Mode avancé" name="Advanced"/>
+	</combo_box>
 	<text name="TimeText" tool_tip="Heure actuelle (Pacifique)">
 		00h00 PST
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml b/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml
index 83543e3d0b..969bd1ac44 100644
--- a/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml
@@ -2,35 +2,47 @@
 <panel label="Choses" name="objects panel">
 	<panel label="" name="sidepanel__inventory_panel">
 		<layout_stack name="inventory_layout_stack">
-			<layout_panel name="inbox_layout_panel">
-				<panel label="" name="marketplace_inbox">
-					<string name="InboxLabelWithArg">
-						Articles reçus ([NUM])
-					</string>
-					<string name="InboxLabelNoArg">
-						Articles reçus
-					</string>
-					<button label="Articles reçus" name="inbox_btn"/>
-					<text name="inbox_fresh_new_count">
-						[NUM] nouv.
-					</text>
-					<panel tool_tip="Drag and drop items to your inventory to manage and use them">
-						<text name="inbox_inventory_placeholder">
-							Ici seront livrés les achats effectués sur la Place du marché.
-						</text>
-					</panel>
-				</panel>
-			</layout_panel>
-			<layout_panel name="outbox_layout_panel">
-				<panel label="" name="marketplace_outbox">
-					<button label="Boîte d&apos;envoi vendeur" name="outbox_btn"/>
-					<button label="" name="outbox_sync_btn" tool_tip="Vers ma vitrine de la Place du marché"/>
-					<panel tool_tip="Drag and drop items here to prepare them for sale on your storefront">
-						<text name="outbox_inventory_placeholder">
-							Configurez votre compte de vendeur de façon à pouvoir utiliser cette fonctionnalité.
-						</text>
-					</panel>
-				</panel>
+			<layout_panel name="inbox_outbox_layout_panel">
+				<layout_stack name="inbox_outbox_layout_stack">
+					<layout_panel name="inbox_layout_panel">
+						<panel label="" name="marketplace_inbox">
+							<string name="InboxLabelWithArg">
+								Articles reçus ([NUM])
+							</string>
+							<string name="InboxLabelNoArg">
+								Articles reçus
+							</string>
+							<button label="Articles reçus" name="inbox_btn"/>
+							<text name="inbox_fresh_new_count">
+								[NUM] nouv.
+							</text>
+							<panel tool_tip="Drag and drop items to your inventory to manage and use them">
+								<text name="inbox_inventory_placeholder">
+									Ici seront livrés les achats effectués sur la Place du marché.
+								</text>
+							</panel>
+						</panel>
+					</layout_panel>
+					<layout_panel name="outbox_layout_panel">
+						<panel label="" name="marketplace_outbox">
+							<string name="OutboxLabelWithArg">
+								Boîte d&apos;envoi vendeur ([NUM])
+							</string>
+							<string name="OutboxLabelNoArg">
+								Boîte d&apos;envoi vendeur
+							</string>
+							<button label="Boîte d&apos;envoi vendeur" name="outbox_btn"/>
+							<button label="" name="outbox_sync_btn" tool_tip="Vers ma vitrine de la Place du marché"/>
+							<panel>
+								<panel name="outbox_inventory_placeholder_panel">
+									<text name="outbox_inventory_placeholder_title">
+										Chargement...
+									</text>
+								</panel>
+							</panel>
+						</panel>
+					</layout_panel>
+				</layout_stack>
 			</layout_panel>
 		</layout_stack>
 		<panel name="button_panel">
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index e6d407f727..3a0553461a 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -339,6 +339,18 @@ Veuillez réessayer de vous connecter dans une minute.
 		Impossible de faire glisser plus d&apos;un objet ici
 	</string>
 	<string name="TooltipPrice" value="[AMOUNT] L$ :"/>
+	<string name="TooltipOutboxNoTransfer">
+		Impossible de vendre ou de transférer un ou plusieurs de ces objets à un autre utilisateur.
+	</string>
+	<string name="TooltipOutboxWorn">
+		Vous portez un ou plusieurs de ces objets. Retirez-les de votre avatar, puis réessayez de les déplacer.
+	</string>
+	<string name="TooltipOutboxFolderLevels">
+		Trop de niveaux de sous-dossiers dans ce dossier. Réorganisez-le de sorte qu&apos;un maximum de 4 niveaux soit utilisé (dossier racine contenant A contenant B contenant C).
+	</string>
+	<string name="TooltipOutboxTooManyObjects">
+		Ce dossier contient plus de 200 objets. Regroupez une partie des articles dans un paquet afin de réduire le nombre d&apos;objets.
+	</string>
 	<string name="TooltipHttpUrl">
 		Cliquez pour afficher cette page web
 	</string>
@@ -1204,8 +1216,65 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="InventoryInboxNoItems">
 		Ici seront livrés les articles achetés sur la Place du marché.
 	</string>
+	<string name="MarketplaceURL">
+		http://marketplace.[DOMAIN_NAME]
+	</string>
+	<string name="MarketplaceURL_CreateStore">
+		http://marketplace.[DOMAIN_NAME]/create_store
+	</string>
+	<string name="MarketplaceURL_LearnMore">
+		http://marketplace.[DOMAIN_NAME]/learn_more
+	</string>
+	<string name="InventoryOutboxCreationErrorTitle">
+		Configuration incorrecte de votre boîte d&apos;envoi vendeur
+	</string>
+	<string name="InventoryOutboxCreationErrorTooltip">
+		Erreur de configuration de la boîte d&apos;envoi vendeur
+	</string>
+	<string name="InventoryOutboxCreationError">
+		Veuillez contacter le service clientèle pour résoudre le problème.
+	</string>
+	<string name="InventoryOutboxNotMerchantTitle">
+		Tout le monde peut vendre des articles sur la Place du marché
+	</string>
+	<string name="InventoryOutboxNotMerchantTooltip">
+		Devenez vendeur !
+	</string>
+	<string name="InventoryOutboxNotMerchant">
+		[[MARKETPLACE_URL] La Place du marché Second Life] comprend plus d&apos;un million de produits virtuels à vendre, tous créés par des résidents. Vous aussi pouvez vendre les articles que vous créez, ainsi que certains articles que vous avez achetés. Le processus est simple et la configuration gratuite. [[LEARN_MORE_URL] En savoir plus] ou [[CREATE_STORE_URL] créer une boutique] sur la Place du marché pour démarrer
+	</string>
+	<string name="InventoryOutboxNoItemsTitle">
+		Un nouveau moyen d&apos;envoyer des articles sur la Place du marché
+	</string>
+	<string name="InventoryOutboxNoItemsTooltip">
+		Glisser-déposer des articles ici afin de les préparer à la vente sur la Place du marché.
+	</string>
 	<string name="InventoryOutboxNoItems">
-		Faites glisser des articles ici en vue de les publier sur votre vitrine de la Place du marché.
+		Faites glisser les articles ou dossiers d&apos;articles à vendre dans cette zone. Une copie de l&apos;article s&apos;affiche, sans que votre inventaire ne soit modifié, sauf si vous avez fait glisser un article pour lequel la copie est interdite. Une fois prêt à envoyer les articles vers la Place du marché, cliquez sur le bouton Charger. Les articles disparaissent de ce dossier lorsqu&apos;ils ont été déplacés vers l&apos;inventaire de la Place du marché.
+	</string>
+	<string name="Marketplace Error None">
+		Aucune erreur
+	</string>
+	<string name="Marketplace Error Not Merchant">
+		Erreur : avant d&apos;envoyer des articles vers la Place du marché, vous devez vous configurer comme vendeur (gratuit).
+	</string>
+	<string name="Marketplace Error Empty Folder">
+		Erreur : ce dossier est vide.
+	</string>
+	<string name="Marketplace Error Unassociated Products">
+		Erreur : le chargement de cet article a échoué en raison d&apos;un nombre trop important d&apos;articles non associés à des produits au niveau de votre compte de vendeur. Pour résoudre ce problème, connectez-vous au site Web de la Place du marché et réduisez le nombre d&apos;articles non associés.
+	</string>
+	<string name="Marketplace Error Object Limit">
+		Erreur : cet article contient trop d&apos;objets. Pour résoudre le problème, regroupez des objets dans des paquets afin de réduire le nombre total à moins de 200.
+	</string>
+	<string name="Marketplace Error Folder Depth">
+		Erreur : trop de niveaux de dossiers imbriqués concernant cet article. Réorganisez le tout afin qu&apos;un maximum de 3 niveaux soit utilisé.
+	</string>
+	<string name="Marketplace Error Unsellable Item">
+		Erreur : cet article ne peut pas être vendu sur la Place du marché.
+	</string>
+	<string name="Marketplace Error Internal Import">
+		Erreur : un problème est survenu concernant cet article. Veuillez réessayer ultérieurement.
 	</string>
 	<string name="no_transfer" value=" (pas de transfert)"/>
 	<string name="no_modify" value=" (pas de modification)"/>
@@ -2441,7 +2510,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Effet max.
 	</string>
 	<string name="Breast Physics InOut Spring">
-		Vibration
+		Élasticité
 	</string>
 	<string name="Breast Physics InOut Gain">
 		Amplification
@@ -2453,7 +2522,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Effet max.
 	</string>
 	<string name="Breast Physics UpDown Spring">
-		Vibration
+		Élasticité
 	</string>
 	<string name="Breast Physics UpDown Gain">
 		Amplification
@@ -2465,7 +2534,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Effet max.
 	</string>
 	<string name="Breast Physics LeftRight Spring">
-		Vibration
+		Élasticité
 	</string>
 	<string name="Breast Physics LeftRight Gain">
 		Amplification
@@ -2489,7 +2558,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Effet max.
 	</string>
 	<string name="Belly Physics UpDown Spring">
-		Vibration
+		Élasticité
 	</string>
 	<string name="Belly Physics UpDown Gain">
 		Amplification
@@ -2513,7 +2582,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Effet max.
 	</string>
 	<string name="Butt Physics UpDown Spring">
-		Vibration
+		Élasticité
 	</string>
 	<string name="Butt Physics UpDown Gain">
 		Amplification
@@ -2525,7 +2594,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Effet max.
 	</string>
 	<string name="Butt Physics LeftRight Spring">
-		Vibration
+		Élasticité
 	</string>
 	<string name="Butt Physics LeftRight Gain">
 		Amplification
@@ -4185,7 +4254,7 @@ de l&apos;infraction signalée
 	<string name="Female - Wow">
 		Femme - Ouah !
 	</string>
-	<string name="/bow">
+	<string name="/bow1">
 		/s&apos;incliner
 	</string>
 	<string name="/clap">
@@ -4228,7 +4297,7 @@ de l&apos;infraction signalée
 		/fumer
 	</string>
 	<string name="/stretch">
-		/s&apos;étirer
+		/bailler
 	</string>
 	<string name="/whistle">
 		/siffler
diff --git a/indra/newview/skins/default/xui/it/floater_about.xml b/indra/newview/skins/default/xui/it/floater_about.xml
index 214ae96373..db4dbe02e2 100644
--- a/indra/newview/skins/default/xui/it/floater_about.xml
+++ b/indra/newview/skins/default/xui/it/floater_about.xml
@@ -42,15 +42,23 @@ Versione Server voice: [VOICE_VERSION]
 			<button label="Copia negli appunti" name="copy_btn"/>
 		</panel>
 		<panel label="Ringraziamenti" name="credits_panel">
-			<text_editor name="credits_editor">
-				Second Life ti è offerto da Philip, Tessa, Andrew, Cory, Ian, James, Phoenix, Ryan, Haney, Dan, Char, Ben, John, Tanya, Eddie, Richard, Mitch, Doug, Eric, Frank, Bruce, Aaron, Peter, Alice, Charlie, Debra, Eileen, Helen, Janet, Steffan, Steve, Tom, Mark, Hunter, Xenon, Burgess, Bill, Jim, Lee, Hamlet, Daniel, Jeff, Todd, Sarah, Tim, Stephanie, Colin, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Jack, Vektor, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Jesse, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Yuko, Makiko, Thomas, Harry, Seth, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Brad, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, Beez, Milo, Hermia, Red, Thrax, Gulliver, Joe, Sally, Paul, Jose, Rejean, Dore, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, Dustin, George, Del, Matthew, Cat, Jacqui, Adrian, Viola, Alfred, Noel, Irfan, Yool, Rika, Jane, Frontier, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Jeremy, JP, Jake, Anthony, Maurice, Madhavi, Leopard, Kyle, Joon, Bert, Belinda, Jon, Kristi, Bridie, Pramod, Socrates, Maria, Aric, Adreanne, Jay, Kari, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Colossus, Zen, BigPapi, Pastrami, Kurz, Mani, Neuro, Mel, Sardonyx, MJ, Rowan, Sgt, Elvis, Samuel, Leo, Bryan, Niko, Austin, Soft, Poppy, Rachel, Aki, Banzai, Alexa, Sue, Bender, CG, Angelo, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Rothman, Niall, Marin, Allison, Katie, Dawn, Dusty, Katt, Judy, Andrea, Ambroff, Infinity, Rico, Gail, Kalpana, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Maestro, Simone, Yang, T, Shannon, Nelson, Khanh, Scott, Courtney, Charlene, Quixote, Susan, Zed, Amanda, Katelin, Enkidu, Roxie, Esbee, JoRoan, Scarlet, Tay, Kevin, Wolfgang, Johnny, Ray, Andren, Merov, Bob, Rand, Howard, Callen, Heff, Galen, Newell, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl, Ashley, JessieAnn, Huseby, Karina, Paris, Kurt, Rick, Lis, Kotler, Theeba, Lynx, Murphy, Doten, Taka, Norm, Jillian, Marcus, Mae, Novack, Esther, Perry, Dana, Ducot, Javier, Porter, Madison, Gecko, Dough, JR, Gisele, Crimp, Norie, Arch, Kimi, Fisher, Barbara, Jason, Peggy, Bernard, Jules, Leroy, Eva, Khederian, Campbell, Vogt, Masido, Karel, Torres, Lo, Breezer, Delby, Rountree, Anna, Servus, Rue, Itiaes, Chuck, Luna, Novella, Zaza, Wen, Gino, Lex, Cassandra, Limey, Nancy, Anukul, Silver, Brodesky, Jinsai, Squid, Gez, Rakesh, Ladan, Edelman, Marcet, Squire, Tatem, Tony, Jerm, Tia, Falcon, BK, Tiggs, Driscoll, Bacon, Timothee, Cru, Carmilla, Coyot, Webb, Kazu, Rudas, LJ, Sea, Ali Wallace, Bewest, Pup, Drub, Dragon, Inoshiro, Byron, Rhett, Xandix, Aimee, Fredrik, Thor, Teddy, Baron, Nelly, Ghengis, Epic, Eli, Stone, Grapes, Irie, Prep, Scobu, Valerie, Alain e molti altri ancora.
-
-Si ringraziano i seguenti residenti per aver contribuito a rendere questa versione la migliore possibile: Drew Dwi, Zai Lynch, Latif Khalifa, Ellla McMahon, Harleen Gretzky, Squirrel Wood, Malarthi Behemoth, Dante Tucker, Buckaroo Mu, Eddi Decosta, Dirk, Talamasca, Torben Trautman, Irene Muni, Aralara Rajal, Aura Dirval, Cayu Cluny, Eva Rau, FreeSL Aeon, Frontera Thor, Inma Rau, Lunita Savira, Minerva Memel, Polo Gufler, Xiki Luik, Lilly Zenovka, Vick Forcella, Sasy Scarborough, Gentle Welinder, Elric Anatine, Techwolf Lupindo, Dusan Writer, WolfPup Lowenhar, Marianne McCann, Fiachra Lach, Sitearm Madonna, Sudane Erato, Sahkolihaa Contepomi, Sachi Vixen, Questar Utu, Dimitrio Lewis, Matto Destiny, Scrim Pinion, Radio Signals, Psi Merlin, Pixel Gausman, Mel Vanbeeck, Laurent Bechir, Lamorna Proctor, Lares Carter, Gwyneth Llewelyn, Hydra Shaftoe, Holger Gilruth, Gentle Heron, Carla Broek, Boroondas Gupte, Fury Rosewood, Flower Ducatillon, Colpo Wexler, gwampa Lomu, Borg Capalini, Beansy Twine, Ardy Lay, , 45ms Zhong, Adeon Writer, Aeonix Aeon, Ai Austin, Aiko Ying, Alexandrea Fride, Alliez Mysterio, Annie Milestone, Annika Genezzia, Ansariel Hiller, ArminasX Saiman, Arya Braveheart, Asaeda Meltingdots, Asturkon Jua, Avallyn Oakleaf, Avatar Quinzet, BabyA Littlething, Bacchus Ireto, Bazaar, Riva, Benjamin Bigdipper, Beth Walcher, Bezilon Kasei, Biancaluce Robbiani, Bill Walach, blakopal Galicia, Blitzckreed Levenque, Bryn Oh, Callipygian Christensen, Cap Carver, Carr Arbenlow, Chantal Harvey, Charles Courtois, Charlie Sazaland, Cherry Cheevers, ChickyBabes Zuzu, Christopher  Organiser, Ciaran Laval, Clara Young, Celierra Darling, Corinne Helendale, Corro Moseley, Coughdrop Littlething, Darien Caldwell, Dartagan Shepherd, Debs Regent, Decro Schmooz, Denim Kamachi, DiJodi Dubratt, Dil Spitz, Edgware Marker, Egehan Dryke, Emma Portilo, Emmie Fairymeadow, Evangelista Emerald, Faelon Swordthain, Frenchimmo Sabra, Gaberoonie Zanzibar, Ganymedes Costagravas, Gene Frostbite, GeneJ Composer, Giggles Littlebird, Grady Echegaray, Guni Greenstein, Gypsy Tripsa, Hackshaven Harford, Ham Rambler, Han Shuffle, Hanglow Short, Hatzfeld Runo, herina Bode, Horatio Freund, Hypatia Callisto, Hypatia Pickens, Identity Euler, Imnotgoing Sideways, Innula Zenovka, Iyoba Tarantal, Jack Abraham, Jagga Meredith, Jennifer Boyle, Jeremy Marquez, Jessica Qin, Jinx Nordberg, Jo Bernandes, Jocial Sonnenkern, Joel Savard, Jondan Lundquist, Josef Munster, Josette Windlow, Juilan Tripsa, Juro Kothari, Justin RiversRunRed, Kagehi Kohn, Kaimen Takahe, Keklily Longfall, Ken Lavender, Kestral Karas, Khisme Nitely, Kimar Coba, Kithrak Kirkorian, Kitty Barnett, Kolor Fall, Komiko Okamoto, Korvel Noh, Larry Pixel, Leal Choche, len Starship, Lenae Munz, Lexi Frua, Lillie Cordeaux, Lizzy Macarthur, LSL Scientist, Luban Yiyuan, Luc Starsider, Maccus McCullough, Madison Blanc, Maggie Darwin, Mallory Destiny, Manx Wharton, Marc Claridge, Marc2 Sands, Matthew Anthony, Maxim RiversRunRed, Medhue Simoni, Melinda Latynina, Mencius Watts, Michi Lumin, Midian Farspire, Miles Glaz, Mindy Mathy, Mitch Wagner, Mo Hax, Mourna Biziou, Nao Noe, naofan Teardrop, Naomah Beaumont, Nathiel Siamendes, Nber Medici, Neko Link, Netpat Igaly, Neutron Chesnokov, Newfie Pendragon, Nicholai Laviscu, Nick Rhodes, Nicoladie Gymnast, Ollie Kubrick, Orenj Marat, Orion Delphis, Oryx Tempel, Parvati Silverweb, PeterPunk Mooney, Pixel Scientist, Pounce Teazle, Professor Noarlunga, Quantum Destiny, Quicksilver Hermes, Ralf Setsuko, RAT Quan, RedMokum Bravin, Revolution Perenti, Rezit Sideways, Rich Grainger, Rosco Teardrop, Rose Evans, Rudee Voom, RufusTT Horsefly, Saii Hallard, SaintLEOlions Zimer, Samm Larkham, Satanello Miami, SexySteven Morrisey, Sheet Spotter, Shnurui Troughton, sicarius Thorne, Sicarius Toxx, Sini Nubalo, SLB Wirefly, snowy Sidran, Soupa Segura, ST Mensing, Starshine Halasy, Stickman Ingmann, Synystyr Texan, Takeda Terrawyng, Tali Rosca, Templar Merlin, Tezcatlipoca Bisiani, Tiel Stonecutter, Tony Kembia, TouchaHoney Perhaps, Trey Reanimator, TriloByte Zanzibar, Trinity Dechou, Trinity Dejavu, Unlikely Quintessa, UsikuFarasi Kanarik, Veritas Raymaker, Vex Streeter, Viaticus Speculaas, Villain Baroque, Vixie Durant, Void Singer, Watty Berkson, Westley Schridde, Westley Streeter, Whimsy Winx, Winter Ventura, Wundur Primbee, xstorm Radek, YongYong Francois, Zak Westminster, Zana Kohime, Zaren Alexander, Zeja Pyle, ZenMondo Wormser, Zoex Flanagan e molti altri ancora.
-
-
-
-
-&quot;Il lavoro continua, la causa sussiste, la speranza vive ancora e i sogni non svaniranno mai&quot; - Edward Kennedy
+			<text name="linden_intro">
+				Second Life vi è offerto dai Linden:
+			</text>
+			<text_editor name="linden_names">
+				Philip, Andrew, Doug, Richard, Phoenix, Ian, Mark, Robin, Dan, Char, Ryan, Eric, Jim, Lee, Jeff, Michael, Kelly, Steve, Catherine, Bub, Ramzi, Jill, Jeska, Don, Kona, Callum, Charity, Jack, Shawn, babbage, James, Lauren, Blue, Brent, Reuben, Pathfinder, Jesse, Patsy, Torley, Bo, Cyn, Jonathan, Gia, Annette, Ginsu, Harry, Lex, Runitai, Guy, Cornelius, Beth, Swiss, Thumper, Wendy, Teeple, Seth, Dee, Mia, Sally, Liana, Aura, Beez, Milo, Red, Gulliver, Marius, Joe, Jose, Dore, Justin, Nora, Morpheus, Lexie, Amber, Chris, Xan, Leyla, Walker, Sabin, Joshua, Hiromi, Tofu, Fritz, June, Jean, Ivy, Dez, Ken, Betsy, Which, Spike, Rob, Zee, Dustin, George, Claudia, del, Matthew, jane, jay, Adrian, Yool, Rika, Yoz, siobhan, Qarl, Benjamin, Beast, Everett, madhavi, Christopher, Izzy, stephany, Jeremy, sean, adreanne, Pramod, Tobin, sejong, Iridium, maurice, kj, Meta, kari, JP, bert, kyle, Jon, Socrates, Bridie, Ivan, maria, Aric, Coco, Periapse, sandy, Storrs, Lotte, Colossus, Brad, Pastrami, Zen, BigPapi, Banzai, Sardonyx, Mani, Garry, Jaime, Neuro, Samuel, Niko, CeeLo, Austin, Soft, Poppy, emma, tessa, angelo, kurz, alexa, Sue, CG, Blake, Erica, Brett, Bevis, kristen, Q, simon, Enus, MJ, laurap, Kip, Scouse, Ron, Ram, kend, Marty, Prospero, melissa, kraft, Nat, Seraph, Hamilton, Lordan, Green, miz, Ashlei, Trinity, Ekim, Echo, Charlie, Rowan, Rome, Jt, Doris, benoc, Christy, Bao, Kate, Tj, Patch, Cheah, Johan, Brandy, Angela, Oreh, Cogsworth, Lan, Mitchell, Space, Bambers, Einstein, Bender, Malbers, Matias, Maggie, Rothman, Milton, Niall, Marin, Allison, Mango, Andrea, Katt, Yi, Ambroff, Rico, Raymond, Gail, Christa, William, Dawn, Usi, Dynamike, M, Corr, Dante, Molly, kaylee, Danica, Kelv, Lil, jacob, Nya, Rodney, elsie, Blondin, Grant, Nyx, Devin, Monty, Minerva, Keira, Katie, Jenn, Makai, Clare, Joy, Cody, Gayathri, FJ, spider, Oskar, Landon, Jarv, Noelle, Al, Doc, Gray, Vir, t, Maestro, Simone, Shannon, yang, Courtney, Scott, charlene, Quixote, Susan, Zed, Amanda, Katelin, Esbee, JoRoan, Enkidu, roxie, Scarlet, Merov, Kevin, Judy, Rand, Newell, Les, Dessie, Galen, Michon, Geo, Siz, Calyle, Pete, Praveen, Callen, Sheldon, Pink, Nelson, jenelle, Terrence, Nathan, Juan, Sascha, Huseby, Karina, Kaye, Kotler, Lis, Darv, Charrell, Dakota, Kimmora, Theeba, Taka, Mae, Perry, Ducot, dana, Esther, Dough, gisele, Doten, Viale, Fisher, jessieann, ashley, Torres, delby, rountree, kurt, Slaton, Madison, Rue, Gino, Wen, Casssandra, Brodesky, Squid, Gez, Rakesh, Gecko, Ladan, Tony, Tatem, Squire, Falcon, BK, Crimp, Tiggs, Bacon, Coyot, Carmilla, Webb, Sea, Arch, Jillian, Jason, Bernard, Vogt, Peggy, dragon, Pup, xandix, Wallace, Bewest, Inoshiro, Rhett, AG, Aimee, Ghengis, Itiaes, Eli, Steffan, Epic, Grapes, Stone, Prep, Scobu, Robert, Alain, Carla, Vicky, Tia, Alec, Taras, Lisa, Oz, Ariane, Log, House, Kazu, Kim, Drofnas, Tyler, Campbell, Michele, Madeline, Nelly, Baron, Thor, Lori, Hele, Fredrik, Teddy, Pixie, Berry, Gabrielle, Alfonso, Brooke, Wolf, Ringo, Cru, Charlar, Rodvik, Gibson, Elise, Bagman, Greger, Leonidas, Jerm, Leslie, CB, Brenda, Durian, Carlo, mm, Zeeshan, Caleb, Max, Elikak, Mercille, Steph, Chase
+			</text_editor>
+			<text name="contrib_intro">
+				con contributi open source da:
+			</text>
+			<text_editor name="contrib_names">
+				Dummy Name sostituito all&apos;avvio
+			</text_editor>
+			<text name="trans_intro">
+				e le traduzioni da:
+			</text>
+			<text_editor name="trans_names">
+				Dummy Name sostituito all&apos;avvio
 			</text_editor>
 		</panel>
 		<panel label="Licenze" name="licenses_panel">
diff --git a/indra/newview/skins/default/xui/it/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/it/floater_preferences_proxy.xml
new file mode 100644
index 0000000000..86ea8064b1
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_preferences_proxy.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Proxy Settings Floater" title="Impostazioni proxy">
+	<check_box initial_value="false" label="Usa proxy HTTP per le pagine Web" name="web_proxy_enabled"/>
+	<text name="http_proxy_label">
+		Proxy HTTP:
+	</text>
+	<line_editor name="web_proxy_editor" tool_tip="Il nome DNS o l&apos;indirizzo IP del proxy HTTP che preferisci usare."/>
+	<spinner label="Numero porta:" name="web_proxy_port" tool_tip="La porta del proxy HTTP che preferisci usare."/>
+	<check_box label="Usa Proxy SOCKS 5 per il traffico UDP" name="socks_proxy_enabled"/>
+	<text name="socks5_proxy_label">
+		Proxy SOCKS 5:
+	</text>
+	<line_editor name="socks_proxy_editor" tool_tip="Il nome DNS o l&apos;indirizzo IP del proxy SOCKS 5 che preferisci usare."/>
+	<spinner label="Numero porta:" name="socks_proxy_port" tool_tip="La porta del proxy SOCKS 5 che preferisci usare."/>
+	<text name="socks_auth_label">
+		Autenticazione SOCKS:
+	</text>
+	<radio_group name="socks5_auth_type">
+		<radio_item label="Nessuna autenticazione" name="Socks5NoAuth" tool_tip="Il proxy Socks5 non richiede autenticazione." value="Nessuna"/>
+		<radio_item label="Nome utente e password" name="Socks5UserPass" tool_tip="Il proxy Socks5 richiede autenticazione con nome utente e password." value="NomePassword"/>
+	</radio_group>
+	<text name="socks5_username_label">
+		Nome utente:
+	</text>
+	<text name="socks5_password_label">
+		Password:
+	</text>
+	<line_editor name="socks5_username" tool_tip="Il nome utente usato per l&apos;autenticazione con il server SOCKS 5"/>
+	<line_editor name="socks5_password" tool_tip="La password usata per l&apos;autenticazione con il server SOCKS 5"/>
+	<text name="other_proxy_label">
+		Altro traffico proxy HTTP:
+	</text>
+	<radio_group name="other_http_proxy_type">
+		<radio_item label="Senza proxy" name="OtherNoProxy" tool_tip="Il traffico HTTP non Web NON verrà inviato ad alcun proxy." value="Nessuna"/>
+		<radio_item label="Usa proxy HTTP" name="OtherHTTPProxy" tool_tip="Il traffico HTTP non Web verrà inviato attraverso un proxy Web configurato." value="Web"/>
+		<radio_item label="Usa proxy SOCKS 5:" name="OtherSocksProxy" tool_tip="Il traffico HTTP non Web verrà inviato attraverso il proxy Socks 5 configurato." value="Socks"/>
+	</radio_group>
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Annulla" label_selected="Annulla" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/menu_inventory.xml b/indra/newview/skins/default/xui/it/menu_inventory.xml
index f18ddb595c..57aa4dc97d 100644
--- a/indra/newview/skins/default/xui/it/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/it/menu_inventory.xml
@@ -83,5 +83,7 @@
 	<menu_item_call label="Modifica" name="Wearable Edit"/>
 	<menu_item_call label="Aggiungi" name="Wearable Add"/>
 	<menu_item_call label="Togli" name="Take Off"/>
+	<menu_item_call label="Copia nella casella venditore in uscita" name="Merchant Copy"/>
+	<menu_item_call label="Passa alla casella venditore in uscita" name="Merchant Move"/>
 	<menu_item_call label="--nessuna opzione--" name="--no options--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/it/menu_media_ctrl.xml b/indra/newview/skins/default/xui/it/menu_media_ctrl.xml
index a0e7370efd..aa9e583f8e 100644
--- a/indra/newview/skins/default/xui/it/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/it/menu_media_ctrl.xml
@@ -3,4 +3,5 @@
 	<menu_item_call label="Taglia" name="Cut"/>
 	<menu_item_call label="Copia" name="Copy"/>
 	<menu_item_call label="Incolla" name="Paste"/>
+	<menu_item_call label="Strumento ispezione Web aperto" name="open_webinspector"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_mode_change.xml b/indra/newview/skins/default/xui/it/menu_mode_change.xml
new file mode 100644
index 0000000000..499dcf1873
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_mode_change.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Mode Change">
+	<menu_item_check label="Di base" name="BasicMode"/>
+	<menu_item_check label="Avanzata" name="AdvancedMode"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index ef40cbda7c..7e3b344117 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -138,7 +138,6 @@
 			<menu_item_call label="Suono ([COST] L$)..." name="Upload Sound"/>
 			<menu_item_call label="Animazione ([COST] L$)..." name="Upload Animation"/>
 			<menu_item_call label="Modella..." name="Upload Model"/>
-			<menu_item_call label="Procedura guidata modellazione..." name="Upload Model Wizard"/>
 			<menu_item_call label="In blocco ([COST] L$ per file)..." name="Bulk Upload"/>
 		</menu>
 		<menu_item_call label="Annulla" name="Undo"/>
@@ -248,6 +247,7 @@
 			<menu_item_check label="Mostra info sulla texture" name="Show Texture Info"/>
 			<menu_item_check label="Mostra colore sotto il cursore" name="Show Color Under Cursor"/>
 			<menu_item_check label="Mostra memoria" name="Show Memory"/>
+			<menu_item_check label="Mostra info mem privata" name="Show Private Mem Info"/>
 			<menu_item_check label="Mostra aggiornamenti agli oggetti" name="Show Updates"/>
 		</menu>
 		<menu label="Forza un errore" name="Force Errors">
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index d09f207af2..ab9de43e6e 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -85,6 +85,19 @@ Accertati che la tua connessione Internet stia funzionando correttamente.
 		Salva i cambiamenti all&apos;attuale parte del corpo/abito?
 		<usetemplate canceltext="Annulla" name="yesnocancelbuttons" notext="Non salvare" yestext="Salva"/>
 	</notification>
+	<notification name="ConfirmNoCopyToOutbox">
+		Non hai l&apos;autorizzazione necessaria per copiare questo oggetto nella casella in uscita di Marketplace. Sei sicuro di volere spostare gli oggetti seguenti?
+        [ITEM_NAME]
+		<usetemplate name="okcancelbuttons" notext="No" yestext="Sì"/>
+	</notification>
+	<notification name="OutboxUploadComplete">
+		Caricamento di Marketplace completato.
+		<usetemplate name="okbutton" yestext="Ottimo!"/>
+	</notification>
+	<notification name="OutboxUploadHadErrors">
+		Caricamento di Marketplace completato senza errori.  Correggi i problemi nella casella in uscita e riprova. Grazie.
+		<usetemplate name="okbutton" yestext="Riprova"/>
+	</notification>
 	<notification name="CompileQueueSaveText">
 		C&apos;è stato un problema importando il testo di uno script per la seguente ragione: [REASON]. Riprova più tardi.
 	</notification>
@@ -2424,7 +2437,15 @@ Riprova tra qualche istante.
 		<form name="form">
 			<button name="Keep" text="Prendi"/>
 			<button name="Discard" text="Rifiuta"/>
-			<button name="Mute" text="Blocca"/>
+			<button name="Mute" text="Blocca Proprietario"/>
+		</form>
+	</notification>
+	<notification name="OwnObjectGiveItem">
+		L&apos;oggetto denominato &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; ti ha dato questo [OBJECTTYPE]:
+&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
+		<form name="form">
+			<button name="Keep" text="Mantieni"/>
+			<button name="Discard" text="Elimina"/>
 		</form>
 	</notification>
 	<notification name="UserGiveItem">
@@ -2568,6 +2589,7 @@ Concedi questa richiesta?
 		&apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; di [NAME]
 [MESSAGE]
 		<form name="form">
+			<button name="Mute" text="Blocca"/>
 			<button name="Ignore" text="Ignora"/>
 		</form>
 	</notification>
@@ -2575,6 +2597,7 @@ Concedi questa richiesta?
 		&apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; di [GROUPNAME]
 [MESSAGE]
 		<form name="form">
+			<button name="Mute" text="Blocca"/>
 			<button name="Ignore" text="Ignora"/>
 		</form>
 	</notification>
@@ -2904,6 +2927,12 @@ Clicca e trascina dovunque nel mondo per ruotare la visuale
 	<notification label="Hai dollari Linden!" name="HintLindenDollar">
 		Ecco il saldo attuale in L$. Clicca su Acquista L$ per acquistare altri dollari Linden.
 	</notification>
+	<notification name="LowMemory">
+		L&apos;allocazione di memoria è quasi esaurita. Alcune funzioni di SL sono state disattivate per evitare un crash. Chiudi le altre applicazioni. Se il problema persiste, riavvia SL.
+	</notification>
+	<notification name="ForceQuitDueToLowMemory">
+		SL verrà interrotto tra 30 secondi a causa di spazio di memoria insufficiente.
+	</notification>
 	<notification name="PopupAttempt">
 		Non è stato possibile aprire una finestra pop-up.
 		<form name="form">
@@ -2911,6 +2940,54 @@ Clicca e trascina dovunque nel mondo per ruotare la visuale
 			<button name="open" text="Apri finestra pop-up"/>
 		</form>
 	</notification>
+	<notification name="SOCKS_NOT_PERMITTED">
+		Il proxy SOCKS 5 &quot;[HOST]:[PORT]&quot; ha rifiutato il collegamento, che non è consentito dalle regole.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_CONNECT_ERROR">
+		Il proxy SOCKS 5 &quot;[HOST]:[PORT]&quot; ha rifiutato il collegamento. Non è stato possibile aprire il canale TCP.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_NOT_ACCEPTABLE">
+		Il proxy SOCKS 5 &quot;[HOST]:[PORT]&quot; ha rifiutato il sistema di autenticazione selezionato.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_AUTH_FAIL">
+		Il proxy SOCKS 5 &quot;[HOST]:[PORT]&quot; ha indicato che le credenziali non sono valide.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_UDP_FWD_NOT_GRANTED">
+		Il proxy SOCKS 5 &quot;[HOST]:[PORT]&quot; ha rifiutato la richiesta associata UDP.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_HOST_CONNECT_FAILED">
+		Collegamento non riuscito al server proxy SOCKS 5 &quot;[HOST]:[PORT]&quot;.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_UNKNOWN_STATUS">
+		Errore proxy sconosciuto per il server &quot;[HOST]:[PORT]&quot;.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_INVALID_HOST">
+		Indirizzo proxy SOCKS o porta &quot;[HOST]:[PORT]&quot; non validi.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_BAD_CREDS">
+		Nome utente o password SOCKS 5 non validi.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="PROXY_INVALID_HTTP_HOST">
+		Indirizzo proxy HTTP o porta &quot;[HOST]:[PORT]&quot; non validi.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="PROXY_INVALID_SOCKS_HOST">
+		Indirizzo proxy SOCKS o porta &quot;[HOST]:[PORT]&quot; non validi.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="ChangeProxySettings">
+		Le impostazioni proxy avranno effetto dopo il riavvio di [APP_NAME].
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="AuthRequest">
 		Il sito &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; nel reame &apos;[REALM]&apos; richiede un nome utente e una password.
 		<form name="form">
diff --git a/indra/newview/skins/default/xui/it/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/it/panel_outbox_inventory.xml
new file mode 100644
index 0000000000..af5e05336e
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_outbox_inventory.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<outbox_inventory_panel name="inventory_outbox" tool_tip="Trascina gli oggetti qui per prepararli per la vendita nel tuo negozio"/>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
index 67fa32a960..bf78432110 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
@@ -11,17 +11,6 @@
 	</text>
 	<check_box label="Porta personalizzata" name="connection_port_enabled"/>
 	<spinner label="Numero porta:" name="connection_port"/>
-	<text name="cache_size_label_l">
-		Dimensioni cache
-	</text>
-	<text name="text_box5">
-		MB
-	</text>
-	<text name="Cache location">
-		Ubicazione della cache:
-	</text>
-	<button label="Sfoglia" label_selected="Sfoglia" name="set_cache"/>
-	<button label="Reimposta" label_selected="Reimposta" name="reset_cache"/>
 	<text name="Web:">
 		Web:
 	</text>
@@ -33,12 +22,6 @@
 	<check_box initial_value="true" label="Accetta cookie" name="cookies_enabled"/>
 	<check_box initial_value="true" label="Abilita Javascript" name="browser_javascript_enabled"/>
 	<check_box initial_value="falso" label="Consenti pop-up nel browser media" name="media_popup_enabled"/>
-	<check_box initial_value="false" label="Abilita proxy Web" name="web_proxy_enabled"/>
-	<text name="Proxy location">
-		Ubicazione proxy:
-	</text>
-	<line_editor name="web_proxy_editor" tool_tip="Il nome o l&apos;indirizzo IP del proxy che preferisci usare"/>
-	<spinner label="Numero porta:" name="web_proxy_port"/>
 	<text name="Software updates:">
 		Aggiornamenti software:
 	</text>
@@ -46,4 +29,8 @@
 		<combo_box.item label="Installa automaticamente" name="Install_automatically"/>
 		<combo_box.item label="Scarica e installa manualmente gli aggiornamenti" name="Install_manual"/>
 	</combo_box>
+	<text name="Proxy Settings:">
+		Impostazioni proxy:
+	</text>
+	<button label="Regola impostazioni proxy" label_selected="Sfoglia" name="set_proxy"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_status_bar.xml b/indra/newview/skins/default/xui/it/panel_status_bar.xml
index 4353eb9d50..0569107999 100644
--- a/indra/newview/skins/default/xui/it/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/it/panel_status_bar.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="status">
-	<panel.string name="StatBarDaysOfWeek">
-		Domenica:Lunedì:Martedì:Mercoledì:Giovedì:Venerdì:Sabato
-	</panel.string>
-	<panel.string name="StatBarMonthsOfYear">
-		Gennaio:Febbraio:Marzo:Aprile:Maggio:Giugno:Luglio:Agosto:Settembre:Ottobre:Novembre:Dicembre
-	</panel.string>
 	<panel.string name="packet_loss_tooltip">
 		Perdita di pacchetti
 	</panel.string>
@@ -25,6 +19,10 @@
 		<text name="balance" tool_tip="Clicca per aggiornare il tuo saldo in L$" value="L$ 20"/>
 		<button label="ACQUISTA L$" name="buyL" tool_tip="Clicca per acquistare più L$"/>
 	</panel>
+	<combo_box name="mode_combo" tool_tip="Seleziona la modalità. Seleziona Di base per esplorare facilmente e rapidamente e per la chat. Seleziona Avanzata per accedere ad altre funzionalità.">
+		<combo_box.item label="Modalità di base" name="Basic"/>
+		<combo_box.item label="Modalità Avanzata" name="Advanced"/>
+	</combo_box>
 	<text name="TimeText" tool_tip="Orario attuale (Pacifico)">
 		24:00, ora del Pacifico
 	</text>
diff --git a/indra/newview/skins/default/xui/it/sidepanel_inventory.xml b/indra/newview/skins/default/xui/it/sidepanel_inventory.xml
index 72ca2f6d68..54fa6df407 100644
--- a/indra/newview/skins/default/xui/it/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_inventory.xml
@@ -2,35 +2,47 @@
 <panel label="Cose" name="objects panel">
 	<panel label="" name="sidepanel__inventory_panel">
 		<layout_stack name="inventory_layout_stack">
-			<layout_panel name="inbox_layout_panel">
-				<panel label="" name="marketplace_inbox">
-					<string name="InboxLabelWithArg">
-						Elementi ricevuti ([NUM])
-					</string>
-					<string name="InboxLabelNoArg">
-						Elementi ricevuti
-					</string>
-					<button label="Elementi ricevuti" name="inbox_btn"/>
-					<text name="inbox_fresh_new_count">
-						[NUM] nuovi
-					</text>
-					<panel tool_tip="Drag and drop items to your inventory to manage and use them">
-						<text name="inbox_inventory_placeholder">
-							Gli acquisti dal mercato verranno consegnati qui.
-						</text>
-					</panel>
-				</panel>
-			</layout_panel>
-			<layout_panel name="outbox_layout_panel">
-				<panel label="" name="marketplace_outbox">
-					<button label="Casella uscita commercianti" name="outbox_btn"/>
-					<button label="" name="outbox_sync_btn" tool_tip="Sposta al mercato"/>
-					<panel tool_tip="Drag and drop items here to prepare them for sale on your storefront">
-						<text name="outbox_inventory_placeholder">
-							Imposta il tuo account commercianti per usare questa funzione.
-						</text>
-					</panel>
-				</panel>
+			<layout_panel name="inbox_outbox_layout_panel">
+				<layout_stack name="inbox_outbox_layout_stack">
+					<layout_panel name="inbox_layout_panel">
+						<panel label="" name="marketplace_inbox">
+							<string name="InboxLabelWithArg">
+								Oggetti ricevuti ([NUM])
+							</string>
+							<string name="InboxLabelNoArg">
+								Oggetti ricevuti
+							</string>
+							<button label="Oggetti ricevuti" name="inbox_btn"/>
+							<text name="inbox_fresh_new_count">
+								[NUM] Nuovo
+							</text>
+							<panel tool_tip="Drag and drop items to your inventory to manage and use them">
+								<text name="inbox_inventory_placeholder">
+									Gli acquisti dal mercato verranno consegnati qui.
+								</text>
+							</panel>
+						</panel>
+					</layout_panel>
+					<layout_panel name="outbox_layout_panel">
+						<panel label="" name="marketplace_outbox">
+							<string name="OutboxLabelWithArg">
+								Casella venditore in uscita ([NUM])
+							</string>
+							<string name="OutboxLabelNoArg">
+								Casella venditore in uscita
+							</string>
+							<button label="Casella venditore in uscita" name="outbox_btn"/>
+							<button label="" name="outbox_sync_btn" tool_tip="Push su negozio Marketplace"/>
+							<panel>
+								<panel name="outbox_inventory_placeholder_panel">
+									<text name="outbox_inventory_placeholder_title">
+										Caricamento in corso...
+									</text>
+								</panel>
+							</panel>
+						</panel>
+					</layout_panel>
+				</layout_stack>
 			</layout_panel>
 		</layout_stack>
 		<panel name="button_panel">
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 1d335e55a6..9918934e12 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -333,6 +333,18 @@ Prova ad accedere nuovamente tra un minuto.
 		Solo un singolo oggetto può essere creato qui
 	</string>
 	<string name="TooltipPrice" value="L$ [AMOUNT]:"/>
+	<string name="TooltipOutboxNoTransfer">
+		Almeno un oggetto non può essere venduto o trasferito a un altro utente.
+	</string>
+	<string name="TooltipOutboxWorn">
+		Stai indossando almeno uno degli oggetti. Rimuovili dall&apos;avatar e prova nuovamente a spostarli.
+	</string>
+	<string name="TooltipOutboxFolderLevels">
+		Questa cartella contiene troppi livelli di cartelle nidificate. Riordina le cartelle interne in modo che non ci siano più di 4 livelli (cartella principale che contiene la cartella A, che contiene la cartella B, che contiene la cartella C).
+	</string>
+	<string name="TooltipOutboxTooManyObjects">
+		Questa cartella contiene più di 200 oggetti. Inserisci alcuni oggetti in scatole per ridurne il numero.
+	</string>
 	<string name="TooltipHttpUrl">
 		Clicca per visitare questa pagina web
 	</string>
@@ -1189,8 +1201,65 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="InventoryInboxNoItems">
 		Gli elementi acquistati attraverso il mercato verranno consegnati qui
 	</string>
+	<string name="MarketplaceURL">
+		http://marketplace.[DOMAIN_NAME]/learn_more
+	</string>
+	<string name="MarketplaceURL_CreateStore">
+		http://marketplace.[DOMAIN_NAME]/create_store
+	</string>
+	<string name="MarketplaceURL_LearnMore">
+		http://marketplace.[DOMAIN_NAME]/learn_more
+	</string>
+	<string name="InventoryOutboxCreationErrorTitle">
+		La casella in uscita del rivenditore non è configurata correttamente
+	</string>
+	<string name="InventoryOutboxCreationErrorTooltip">
+		Errore di configurazione della casella in uscita del rivenditore
+	</string>
+	<string name="InventoryOutboxCreationError">
+		Contatta l&apos;Assistenza clienti per correggere il problema.
+	</string>
+	<string name="InventoryOutboxNotMerchantTitle">
+		Chiunque può vendere oggetti nel Marketplace
+	</string>
+	<string name="InventoryOutboxNotMerchantTooltip">
+		Diventa un rivenditore!
+	</string>
+	<string name="InventoryOutboxNotMerchant">
+		[[MARKETPLACE_URL] Second Life Marketplace] offre in vendita più di un milione di prodotti virtuali, tutti creati da Residenti. Anche tu puoi vendere gli oggetti che crei, oltre ad alcuni degli oggetti che hai acquistato. È facile da usare e l&apos;impostazione è gratuita. [[LEARN_MORE_URL] Leggi ulteriori informazioni] oppure [[CREATE_STORE_URL] crea un negozio] sul Marketplace per cominciare.
+	</string>
+	<string name="InventoryOutboxNoItemsTitle">
+		Un nuovo modo di inviare oggetti al Marketplace
+	</string>
+	<string name="InventoryOutboxNoItemsTooltip">
+		Trascina gli oggetti qui per prepararli per la vendita nel Marketplace
+	</string>
 	<string name="InventoryOutboxNoItems">
-		Trascina gli elementi qui per poi elencarli nel tuo mercato.
+		Trascina elementi o cartelle che desideri vendere in quest&apos;area. Verrà visualizzata una copia dell&apos;elemento, senza che venga modificato l&apos;inventario, tranne nel caso in cui venga trascinato un oggetto per cui non è permessa la copia. Clicca sul pulsante Carica per caricare gli elementi su Marketplace. Dopo aver spostato gli elementi nell&apos;inventario di Marketplace, non saranno più visibili in questa cartella.
+	</string>
+	<string name="Marketplace Error None">
+		Nessun errore
+	</string>
+	<string name="Marketplace Error Not Merchant">
+		Errore: Prima di inviare elementi al Marketplace devi essere impostato come rivenditore (gratis).
+	</string>
+	<string name="Marketplace Error Empty Folder">
+		Errore: questa cartella non include alcun contenuto.
+	</string>
+	<string name="Marketplace Error Unassociated Products">
+		Errore: Oggetto non caricato perché il tuo account venditore ha troppi oggetti che non sono associati con dei prodotti. Per risolvere questo errore, esegui l&apos;accesso al sito di Marketplace e riduci il numero di oggetti non associati.
+	</string>
+	<string name="Marketplace Error Object Limit">
+		Errore: questo elemento contiene troppi oggetti. Per risolvere questo problema, inserisci più oggetti insieme in una scatola per ridurre a meno di 200 il numero totale di oggetti.
+	</string>
+	<string name="Marketplace Error Folder Depth">
+		Errore: questo elemento contiene troppi livelli di cartelle nidificate. Riorganizzalo per ottenere un massimo di 3 livelli di cartelle nidificate.
+	</string>
+	<string name="Marketplace Error Unsellable Item">
+		Errore: Questo elemento non può essere venduto nel Marketplace.
+	</string>
+	<string name="Marketplace Error Internal Import">
+		Errore: problema con questo elemento. Riprova più tardi.
 	</string>
 	<string name="no_transfer" value="(nessun trasferimento)"/>
 	<string name="no_modify" value="(nessuna modifica)"/>
@@ -4089,7 +4158,7 @@ Segnala abuso
 	<string name="Female - Wow">
 		Femmina - Accipicchia
 	</string>
-	<string name="/bow">
+	<string name="/bow1">
 		/inchino
 	</string>
 	<string name="/clap">
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index 56708001c2..47bb2455cf 100644
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -42,15 +42,23 @@ Qt Webkit �ージョン： [QT_WEBKIT_VERSION]
 			<button label="クリップボード�コピー" name="copy_btn"/>
 		</panel>
 		<panel label="クレジット" name="credits_panel">
-			<text_editor name="credits_editor">
-				Second Life ��Philip, Tessa, Andrew, Cory, Ian, James, Phoenix, Ryan, Haney, Dan, Char, Ben, John, Tanya, Eddie, Richard, Mitch, Doug, Eric, Frank, Bruce, Aaron, Peter, Alice, Charlie, Debra, Eileen, Helen, Janet, Steffan, Steve, Tom, Mark, Hunter, Xenon, Burgess, Bill, Jim, Lee, Hamlet, Daniel, Jeff, Todd, Sarah, Tim, Stephanie, Colin, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Jack, Vektor, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Jesse, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Yuko, Makiko, Thomas, Harry, Seth, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Brad, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, Beez, Milo, Hermia, Red, Thrax, Gulliver, Joe, Sally, Paul, Jose, Rejean, Dore, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, Dustin, George, Del, Matthew, Cat, Jacqui, Adrian, Viola, Alfred, Noel, Irfan, Yool, Rika, Jane, Frontier, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Jeremy, JP, Jake, Anthony, Maurice, Madhavi, Leopard, Kyle, Joon, Bert, Belinda, Jon, Kristi, Bridie, Pramod, Socrates, Maria, Aric, Adreanne, Jay, Kari, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Colossus, Zen, BigPapi, Pastrami, Kurz, Mani, Neuro, Mel, Sardonyx, MJ, Rowan, Sgt, Elvis, Samuel, Leo, Bryan, Niko, Austin, Soft, Poppy, Rachel, Aki, Banzai, Alexa, Sue, Bender, CG, Angelo, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Rothman, Niall, Marin, Allison, Katie, Dawn, Dusty, Katt, Judy, Andrea, Ambroff, Infinity, Rico, Gail, Kalpana, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Maestro, Simone, Yang, T, Shannon, Nelson, Khanh, Scott, Courtney, Charlene, Quixote, Susan, Zed, Amanda, Katelin, Enkidu, Roxie, Esbee, JoRoan, Scarlet, Tay, Kevin, Wolfgang, Johnny, Ray, Andren, Merov, Bob, Rand, Howard, Callen, Heff, Galen, Newell, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl, Ashley, JessieAnn, Huseby, Karina, Paris, Kurt, Rick, Lis, Kotler, Theeba, Lynx, Murphy, Doten, Taka, Norm, Jillian, Marcus, Mae, Novack, Esther, Perry, Dana, Ducot, Javier, Porter, Madison, Gecko, Dough, JR, Gisele, Crimp, Norie, Arch, Kimi, Fisher, Barbara, Jason, Peggy, Bernard, Jules, Leroy, Eva, Khederian, Campbell, Vogt, Masido, Karel, Torres, Lo, Breezer, Delby, Rountree, Anna, Servus, Rue, Itiaes, Chuck, Luna, Novella, Zaza, Wen, Gino, Lex, Cassandra, Limey, Nancy, Anukul, Silver, Brodesky, Jinsai, Squid, Gez, Rakesh, Ladan, Edelman, Marcet, Squire, Tatem, Tony, Jerm, Tia, Falcon, BK, Tiggs, Driscoll, Bacon, Timothee, Cru, Carmilla, Coyot, Webb, Kazu, Rudas, LJ, Sea, Ali Wallace, Bewest, Pup, Drub, Dragon, Inoshiro, Byron, Rhett, Xandix, Aimee, Fredrik, Thor, Teddy, Baron, Nelly, Ghengis, Epic, Eli, Stone, Grapes, Irie, Prep, Scobu, Valerie, Alain ��他大勢�方々�よ���供�れ����。
-
-�在最も優れ��ージョン��るよ���力�����次��人�皆様�深�感������。 Drew Dwi, Zai Lynch, Latif Khalifa, Ellla McMahon, Harleen Gretzky, Squirrel Wood, Malarthi Behemoth, Dante Tucker, Buckaroo Mu, Eddi Decosta, Dirk, Talamasca, Torben Trautman, Irene Muni, Aralara Rajal, Aura Dirval, Cayu Cluny, Eva Rau, FreeSL Aeon, Frontera Thor, Inma Rau, Lunita Savira, Minerva Memel, Polo Gufler, Xiki Luik, Lilly Zenovka, Vick Forcella, Sasy Scarborough, Gentle Welinder, Elric Anatine, Techwolf Lupindo, Dusan Writer, WolfPup Lowenhar, Marianne McCann, Fiachra Lach, Sitearm Madonna, Sudane Erato, Sahkolihaa Contepomi, Sachi Vixen, Questar Utu, Dimitrio Lewis, Matto Destiny, Scrim Pinion, Radio Signals, Psi Merlin, Pixel Gausman, Mel Vanbeeck, Laurent Bechir, Lamorna Proctor, Lares Carter, Gwyneth Llewelyn, Hydra Shaftoe, Holger Gilruth, Gentle Heron, Carla Broek, Boroondas Gupte, Fury Rosewood, Flower Ducatillon, Colpo Wexler, gwampa Lomu, Borg Capalini, Beansy Twine, Ardy Lay, , 45ms Zhong, Adeon Writer, Aeonix Aeon, Ai Austin, Aiko Ying, Alexandrea Fride, Alliez Mysterio, Annie Milestone, Annika Genezzia, Ansariel Hiller, ArminasX Saiman, Arya Braveheart, Asaeda Meltingdots, Asturkon Jua, Avallyn Oakleaf, Avatar Quinzet, BabyA Littlething, Bacchus Ireto, Bazaar, Riva, Benjamin Bigdipper, Beth Walcher, Bezilon Kasei, Biancaluce Robbiani, Bill Walach, blakopal Galicia, Blitzckreed Levenque, Bryn Oh, Callipygian Christensen, Cap Carver, Carr Arbenlow, Chantal Harvey, Charles Courtois, Charlie Sazaland, Cherry Cheevers, ChickyBabes Zuzu, Christopher  Organiser, Ciaran Laval, Clara Young, Celierra Darling, Corinne Helendale, Corro Moseley, Coughdrop Littlething, Darien Caldwell, Dartagan Shepherd, Debs Regent, Decro Schmooz, Denim Kamachi, DiJodi Dubratt, Dil Spitz, Edgware Marker, Egehan Dryke, Emma Portilo, Emmie Fairymeadow, Evangelista Emerald, Faelon Swordthain, Frenchimmo Sabra, Gaberoonie Zanzibar, Ganymedes Costagravas, Gene Frostbite, GeneJ Composer, Giggles Littlebird, Grady Echegaray, Guni Greenstein, Gypsy Tripsa, Hackshaven Harford, Ham Rambler, Han Shuffle, Hanglow Short, Hatzfeld Runo, herina Bode, Horatio Freund, Hypatia Callisto, Hypatia Pickens, Identity Euler, Imnotgoing Sideways, Innula Zenovka, Iyoba Tarantal, Jack Abraham, Jagga Meredith, Jennifer Boyle, Jeremy Marquez, Jessica Qin, Jinx Nordberg, Jo Bernandes, Jocial Sonnenkern, Joel Savard, Jondan Lundquist, Josef Munster, Josette Windlow, Juilan Tripsa, Juro Kothari, Justin RiversRunRed, Kagehi Kohn, Kaimen Takahe, Keklily Longfall, Ken Lavender, Kestral Karas, Khisme Nitely, Kimar Coba, Kithrak Kirkorian, Kitty Barnett, Kolor Fall, Komiko Okamoto, Korvel Noh, Larry Pixel, Leal Choche, len Starship, Lenae Munz, Lexi Frua, Lillie Cordeaux, Lizzy Macarthur, LSL Scientist, Luban Yiyuan, Luc Starsider, Maccus McCullough, Madison Blanc, Maggie Darwin, Mallory Destiny, Manx Wharton, Marc Claridge, Marc2 Sands, Matthew Anthony, Maxim RiversRunRed, Medhue Simoni, Melinda Latynina, Mencius Watts, Michi Lumin, Midian Farspire, Miles Glaz, Mindy Mathy, Mitch Wagner, Mo Hax, Mourna Biziou, Nao Noe, naofan Teardrop, Naomah Beaumont, Nathiel Siamendes, Nber Medici, Neko Link, Netpat Igaly, Neutron Chesnokov, Newfie Pendragon, Nicholai Laviscu, Nick Rhodes, Nicoladie Gymnast, Ollie Kubrick, Orenj Marat, Orion Delphis, Oryx Tempel, Parvati Silverweb, PeterPunk Mooney, Pixel Scientist, Pounce Teazle, Professor Noarlunga, Quantum Destiny, Quicksilver Hermes, Ralf Setsuko, RAT Quan, RedMokum Bravin, Revolution Perenti, Rezit Sideways, Rich Grainger, Rosco Teardrop, Rose Evans, Rudee Voom, RufusTT Horsefly, Saii Hallard, SaintLEOlions Zimer, Samm Larkham, Satanello Miami, SexySteven Morrisey, Sheet Spotter, Shnurui Troughton, sicarius Thorne, Sicarius Toxx, Sini Nubalo, SLB Wirefly, snowy Sidran, Soupa Segura, ST Mensing, Starshine Halasy, Stickman Ingmann, Synystyr Texan, Takeda Terrawyng, Tali Rosca, Templar Merlin, Tezcatlipoca Bisiani, Tiel Stonecutter, Tony Kembia, TouchaHoney Perhaps, Trey Reanimator, TriloByte Zanzibar, Trinity Dechou, Trinity Dejavu, Unlikely Quintessa, UsikuFarasi Kanarik, Veritas Raymaker, Vex Streeter, Viaticus Speculaas, Villain Baroque, Vixie Durant, Void Singer, Watty Berkson, Westley Schridde, Westley Streeter, Whimsy Winx, Winter Ventura, Wundur Primbee, xstorm Radek, YongYong Francois, Zak Westminster, Zana Kohime, Zaren Alexander, Zeja Pyle, ZenMondo Wormser, Zoex Flanagan ��他大勢�方々。
-
-
-
-
-「努力�続�。目標��続�る。希望�残�れ��る。夢�決��消���。� - エドワード・ケ�ディ
+			<text name="linden_intro">
+				Second Life ��供元： Lindens �：
+			</text>
+			<text_editor name="linden_names">
+				Philip, Andrew, Doug, Richard, Phoenix, Ian, Mark, Robin, Dan, Char, Ryan, Eric, Jim, Lee, Jeff, Michael, Kelly, Steve, Catherine, Bub, Ramzi, Jill, Jeska, Don, Kona, Callum, Charity, Jack, Shawn, babbage, James, Lauren, Blue, Brent, Reuben, Pathfinder, Jesse, Patsy, Torley, Bo, Cyn, Jonathan, Gia, Annette, Ginsu, Harry, Lex, Runitai, Guy, Cornelius, Beth, Swiss, Thumper, Wendy, Teeple, Seth, Dee, Mia, Sally, Liana, Aura, Beez, Milo, Red, Gulliver, Marius, Joe, Jose, Dore, Justin, Nora, Morpheus, Lexie, Amber, Chris, Xan, Leyla, Walker, Sabin, Joshua, Hiromi, Tofu, Fritz, June, Jean, Ivy, Dez, Ken, Betsy, Which, Spike, Rob, Zee, Dustin, George, Claudia, del, Matthew, jane, jay, Adrian, Yool, Rika, Yoz, siobhan, Qarl, Benjamin, Beast, Everett, madhavi, Christopher, Izzy, stephany, Jeremy, sean, adreanne, Pramod, Tobin, sejong, Iridium, maurice, kj, Meta, kari, JP, bert, kyle, Jon, Socrates, Bridie, Ivan, maria, Aric, Coco, Periapse, sandy, Storrs, Lotte, Colossus, Brad, Pastrami, Zen, BigPapi, Banzai, Sardonyx, Mani, Garry, Jaime, Neuro, Samuel, Niko, CeeLo, Austin, Soft, Poppy, emma, tessa, angelo, kurz, alexa, Sue, CG, Blake, Erica, Brett, Bevis, kristen, Q, simon, Enus, MJ, laurap, Kip, Scouse, Ron, Ram, kend, Marty, Prospero, melissa, kraft, Nat, Seraph, Hamilton, Lordan, Green, miz, Ashlei, Trinity, Ekim, Echo, Charlie, Rowan, Rome, Jt, Doris, benoc, Christy, Bao, Kate, Tj, Patch, Cheah, Johan, Brandy, Angela, Oreh, Cogsworth, Lan, Mitchell, Space, Bambers, Einstein, Bender, Malbers, Matias, Maggie, Rothman, Milton, Niall, Marin, Allison, Mango, Andrea, Katt, Yi, Ambroff, Rico, Raymond, Gail, Christa, William, Dawn, Usi, Dynamike, M, Corr, Dante, Molly, kaylee, Danica, Kelv, Lil, jacob, Nya, Rodney, elsie, Blondin, Grant, Nyx, Devin, Monty, Minerva, Keira, Katie, Jenn, Makai, Clare, Joy, Cody, Gayathri, FJ, spider, Oskar, Landon, Jarv, Noelle, Al, Doc, Gray, Vir, t, Maestro, Simone, Shannon, yang, Courtney, Scott, charlene, Quixote, Susan, Zed, Amanda, Katelin, Esbee, JoRoan, Enkidu, roxie, Scarlet, Merov, Kevin, Judy, Rand, Newell, Les, Dessie, Galen, Michon, Geo, Siz, Calyle, Pete, Praveen, Callen, Sheldon, Pink, Nelson, jenelle, Terrence, Nathan, Juan, Sascha, Huseby, Karina, Kaye, Kotler, Lis, Darv, Charrell, Dakota, Kimmora, Theeba, Taka, Mae, Perry, Ducot, dana, Esther, Dough, gisele, Doten, Viale, Fisher, jessieann, ashley, Torres, delby, rountree, kurt, Slaton, Madison, Rue, Gino, Wen, Casssandra, Brodesky, Squid, Gez, Rakesh, Gecko, Ladan, Tony, Tatem, Squire, Falcon, BK, Crimp, Tiggs, Bacon, Coyot, Carmilla, Webb, Sea, Arch, Jillian, Jason, Bernard, Vogt, Peggy, dragon, Pup, xandix, Wallace, Bewest, Inoshiro, Rhett, AG, Aimee, Ghengis, Itiaes, Eli, Steffan, Epic, Grapes, Stone, Prep, Scobu, Robert, Alain, Carla, Vicky, Tia, Alec, Taras, Lisa, Oz, Ariane, Log, House, Kazu, Kim, Drofnas, Tyler, Campbell, Michele, Madeline, Nelly, Baron, Thor, Lori, Hele, Fredrik, Teddy, Pixie, Berry, Gabrielle, Alfonso, Brooke, Wolf, Ringo, Cru, Charlar, Rodvik, Gibson, Elise, Bagman, Greger, Leonidas, Jerm, Leslie, CB, Brenda, Durian, Carlo, mm, Zeeshan, Caleb, Max, Elikak, Mercille, Steph, Chase
+			</text_editor>
+			<text name="contrib_intro">
+				オープンソース��供：
+			</text>
+			<text_editor name="contrib_names">
+				Dummy Name �実行時間�置���
+			</text_editor>
+			<text name="trans_intro">
+				翻訳会社：
+			</text>
+			<text_editor name="trans_names">
+				Dummy Name �実行時間�置���
 			</text_editor>
 		</panel>
 		<panel label="ライセンス" name="licenses_panel">
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml
new file mode 100644
index 0000000000..4638fd002e
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Proxy Settings Floater" title="プロキシ設定">
+	<check_box initial_value="false" label="ウェブページ� HTTP プロキシを使�" name="web_proxy_enabled"/>
+	<text name="http_proxy_label">
+		HTTP プロキシ：
+	</text>
+	<line_editor name="web_proxy_editor" tool_tip="使用�る HTTP プロキシ� DNS ���� IP アドレス。"/>
+	<spinner label="�ート番�：" name="web_proxy_port" tool_tip="使用�る HTTP プロキシ�ート。"/>
+	<check_box label="UDP トラフィック� SOCKS 5 プロキシを使�" name="socks_proxy_enabled"/>
+	<text name="socks5_proxy_label">
+		SOCKS 5 プロキシ：
+	</text>
+	<line_editor name="socks_proxy_editor" tool_tip="使用�る SOCKS 5 プロキシ� DNS ���� IP アドレス。"/>
+	<spinner label="�ート番�：" name="socks_proxy_port" tool_tip="使用�る SOCKS 5 プロキシ�ート。"/>
+	<text name="socks_auth_label">
+		SOCKS �証：
+	</text>
+	<radio_group name="socks5_auth_type">
+		<radio_item label="�証��" name="Socks5NoAuth" tool_tip="Socks 5 プロキシ��証�必���り��ん。" value="��"/>
+		<radio_item label="ユーザー�/パスワード" name="Socks5UserPass" tool_tip="Socks5 プロキシ�ユーザー�/パスワード��証�必���。" value="UserPass"/>
+	</radio_group>
+	<text name="socks5_username_label">
+		ユーザー�：
+	</text>
+	<text name="socks5_password_label">
+		パスワード：
+	</text>
+	<line_editor name="socks5_username" tool_tip="SOCKS 5 サー�ー��証�使用�れ�ユーザー�"/>
+	<line_editor name="socks5_password" tool_tip="SOCKS 5 サー�ー��証�使用�れ�パスワード"/>
+	<text name="other_proxy_label">
+		他� HTTP トラフィックプロキシ：
+	</text>
+	<radio_group name="other_http_proxy_type">
+		<radio_item label="プロキシ���" name="OtherNoProxy" tool_tip="ウェブ以外� HTTP トラフィック���れ�プロキシ�もルーティング�れ��ん。" value="��"/>
+		<radio_item label="HTTP プロキシを使�" name="OtherHTTPProxy" tool_tip="ウェブ以外� HTTP �設定済�ウェブプロキシを通��ルーティング�れ��。" value="Web"/>
+		<radio_item label="SOCKS 5 プロキシを使�" name="OtherSocksProxy" tool_tip="ウェブ以外� HTTP トラフィック�設定済�� Socks 5 プロキシを通��ルーティング�れ��。" value="Socks"/>
+	</radio_group>
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="�り消�" label_selected="�り消�" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory.xml b/indra/newview/skins/default/xui/ja/menu_inventory.xml
index f78ec09e5e..9449e61274 100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory.xml
@@ -83,5 +83,7 @@
 	<menu_item_call label="編集" name="Wearable Edit"/>
 	<menu_item_call label="追加" name="Wearable Add"/>
 	<menu_item_call label="�り外�" name="Take Off"/>
+	<menu_item_call label="マー�ャント�アウトボックス�コピー" name="Merchant Copy"/>
+	<menu_item_call label="マー�ャント�アウトボックス�移動" name="Merchant Move"/>
 	<menu_item_call label="��オプション����" name="--no options--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml b/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml
index d155dc17e0..faae4ef717 100644
--- a/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml
@@ -3,4 +3,5 @@
 	<menu_item_call label="カット" name="Cut"/>
 	<menu_item_call label="コピー" name="Copy"/>
 	<menu_item_call label="貼り付�" name="Paste"/>
+	<menu_item_call label="ウェブインスペクターを開�" name="open_webinspector"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_mode_change.xml b/indra/newview/skins/default/xui/ja/menu_mode_change.xml
new file mode 100644
index 0000000000..dff3392bd5
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_mode_change.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Mode Change">
+	<menu_item_check label="ベーシック" name="BasicMode"/>
+	<menu_item_check label="アド�ンス" name="AdvancedMode"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 223c1e1f11..edce5c50fc 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -138,7 +138,6 @@
 			<menu_item_call label="サウンド（L$[COST]）..." name="Upload Sound"/>
 			<menu_item_call label="アニメーション（L$[COST]）..." name="Upload Animation"/>
 			<menu_item_call label="モデル" name="Upload Model"/>
-			<menu_item_call label="モデルウィザード" name="Upload Model Wizard"/>
 			<menu_item_call label="一括 （ファイル���L$[COST]）..." name="Bulk Upload"/>
 		</menu>
 		<menu_item_call label="元�戻�" name="Undo"/>
@@ -253,6 +252,7 @@
 			<menu_item_check label="マトリックスを表示�る" name="Show Matrices"/>
 			<menu_item_check label="カーソルを乗��場所�色を表示�る" name="Show Color Under Cursor"/>
 			<menu_item_check label="メモリを表示：" name="Show Memory"/>
+			<menu_item_check label="プライベートメモリ情報を表示" name="Show Private Mem Info"/>
 			<menu_item_check label="オブジェクト�アップデートを表示�る" name="Show Updates"/>
 		</menu>
 		<menu label="エラー実行" name="Force Errors">
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 6bff82bec4..c138aeb383 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -84,6 +84,19 @@
 		�在�衣類�身体部��変更を�存����？
 		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="�存���" yestext="�存"/>
 	</notification>
+	<notification name="ConfirmNoCopyToOutbox">
+		マー�ャント�アウトボックス��れをコピー�る権���り��。次�アイテムを移動����？
+[ITEM_NAME]
+		<usetemplate name="okcancelbuttons" notext="���" yestext="��"/>
+	</notification>
+	<notification name="OutboxUploadComplete">
+		マーケットプレイス��アップロード�完了����。
+		<usetemplate name="okbutton" yestext="や����"/>
+	</notification>
+	<notification name="OutboxUploadHadErrors">
+		マーケットプレイス��アップロード�完了時�エラー�発生����。アウトボックス��題を解決���も�一度�試�����。�り��������。
+		<usetemplate name="okbutton" yestext="�トライ�"/>
+	</notification>
 	<notification name="CompileQueueSaveText">
 		次��由��スクリプト用テキスト�アップロード時��題�起�り���。
 [REASON]
@@ -2471,7 +2484,15 @@ Web ページã�«ãƒªãƒ³ã‚¯ã�™ã‚‹ã�¨ã€�他人ã�Œã�“ã�®å ´æ‰€ã�«ç°¡å�˜ã�«ã‚¢ã‚¯ã‚»ã
 		<form name="form">
 			<button name="Keep" text="���る"/>
 			<button name="Discard" text="破棄"/>
-			<button name="Mute" text="ブロック"/>
+			<button name="Mute" text="所有者をブロック"/>
+		</form>
+	</notification>
+	<notification name="OwnObjectGiveItem">
+		&lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; ������オブジェクト������ [OBJECTTYPE] を渡����：
+&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
+		<form name="form">
+			<button name="Keep" text="キープ"/>
+			<button name="Discard" text="処分�る"/>
 		</form>
 	</notification>
 	<notification name="UserGiveItem">
@@ -2615,6 +2636,7 @@ Web ページã�«ãƒªãƒ³ã‚¯ã�™ã‚‹ã�¨ã€�他人ã�Œã�“ã�®å ´æ‰€ã�«ç°¡å�˜ã�«ã‚¢ã‚¯ã‚»ã
 		[NAME] �「&lt;nolink&gt;[TITLE]&lt;/nolink&gt;�
 [MESSAGE]
 		<form name="form">
+			<button name="Mute" text="ブロック"/>
 			<button name="Ignore" text="無視�る"/>
 		</form>
 	</notification>
@@ -2622,6 +2644,7 @@ Web ページã�«ãƒªãƒ³ã‚¯ã�™ã‚‹ã�¨ã€�他人ã�Œã�“ã�®å ´æ‰€ã�«ç°¡å�˜ã�«ã‚¢ã‚¯ã‚»ã
 		[GROUPNAME] �「&lt;nolink&gt;[TITLE]&lt;/nolink&gt;�
 [MESSAGE]
 		<form name="form">
+			<button name="Mute" text="ブロック"/>
 			<button name="Ignore" text="無視�る"/>
 		</form>
 	</notification>
@@ -2948,6 +2971,12 @@ M キーを押��変更���。
 	<notification label="����リンデンドル" name="HintLindenDollar">
 		�れ����� L$ 残高��。リンデンドルを購入�る��「L$ �購入�をクリック���。
 	</notification>
+	<notification name="LowMemory">
+		メモリプール残��少��������。クラッシュを��る�� SL �機能�一部�無効��り���。他�アプリケーションを終了��状��継続����発�る場��� SL を�起動������。
+	</notification>
+	<notification name="ForceQuitDueToLowMemory">
+		メモリ�足��� 30 秒以内� SL �終了���。
+	</notification>
 	<notification name="PopupAttempt">
 		�ップアップ�ブロック�れ���。
 		<form name="form">
@@ -2955,6 +2984,54 @@ M キーを押��変更���。
 			<button name="open" text="�ップアップウィンドウを開�"/>
 		</form>
 	</notification>
+	<notification name="SOCKS_NOT_PERMITTED">
+		ルールセット�よ��許��れ�������SOCKS 5 プロキシ &quot;[HOST]:[PORT]&quot; �接続を拒絶����。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_CONNECT_ERROR">
+		SOCKS 5 プロキシ &quot;[HOST]:[PORT]&quot; �接続を拒絶�����TCP �ャン�ルを開��������ん���。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_NOT_ACCEPTABLE">
+		SOCKS 5 プロキシ &quot;[HOST]:[PORT]&quot; ��択�れ��証システムを拒絶����。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_AUTH_FAIL">
+		SOCKS 5 プロキシ &quot;[HOST]:[PORT]&quot; �����資格�無効��報告����。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_UDP_FWD_NOT_GRANTED">
+		SOCKS 5 プロキシ &quot;[HOST]:[PORT]&quot; � UDP アソシエート�リクエストを拒絶����。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_HOST_CONNECT_FAILED">
+		SOCKS 5 プロキシサー�ー &quot;[HOST]:[PORT]&quot; �接続����ん���。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_UNKNOWN_STATUS">
+		�明�プロキシエラー�サー�ー &quot;[HOST]:[PORT]&quot; �発生����。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_INVALID_HOST">
+		SOCKS プロキシ�アドレス����ート &quot;[HOST]:[PORT]&quot;�無効��。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_BAD_CREDS">
+		SOCKS 5 �ユーザー����パスワード�正���り��ん。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="PROXY_INVALID_HTTP_HOST">
+		HTTP プロキシ�アドレス����ート &quot;[HOST]:[PORT]&quot;�無効��。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="PROXY_INVALID_SOCKS_HOST">
+		SOCKS プロキシ�アドレス����ート &quot;[HOST]:[PORT]&quot;�無効��。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="ChangeProxySettings">
+		プロキシ�設定� [APP_NAME] を�起動後��映�れ��。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="AuthRequest">
 		「[REALM]���る「&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;��サイト��ユーザー��パスワード�必���。
 		<form name="form">
diff --git a/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml
new file mode 100644
index 0000000000..47f570ab86
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<outbox_inventory_panel name="inventory_outbox" tool_tip="商�を���ドラッグアンドドロップ�る������店頭�並���"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
index 18c41cea38..7877c0495f 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
@@ -11,17 +11,6 @@
 	</text>
 	<check_box label="カスタム�ート" name="connection_port_enabled"/>
 	<spinner label="�ート番�：" name="connection_port"/>
-	<text name="cache_size_label_l">
-		キャッシュサイズ
-	</text>
-	<text name="text_box5">
-		MB
-	</text>
-	<text name="Cache location">
-		キャッシュ��存場所：
-	</text>
-	<button label="�照" label_selected="�照" name="set_cache"/>
-	<button label="リセット" label_selected="リセット" name="reset_cache"/>
 	<text name="Web:">
 		Web：
 	</text>
@@ -33,12 +22,6 @@
 	<check_box initial_value="true" label="Cookie を��入れる" name="cookies_enabled"/>
 	<check_box initial_value="true" label="Javascript を有効��る" name="browser_javascript_enabled"/>
 	<check_box initial_value="false" label="メディアブラウザ��ップアップを有効��る" name="media_popup_enabled"/>
-	<check_box initial_value="false" label="Web プロキシを有効��る" name="web_proxy_enabled"/>
-	<text name="Proxy location">
-		プロキシ：
-	</text>
-	<line_editor name="web_proxy_editor" tool_tip="使用�るプロキシ�ホスト���� IP アドレス"/>
-	<spinner label="�ート番�：" name="web_proxy_port"/>
 	<text name="Software updates:">
 		ソフトウェアアップデート：
 	</text>
@@ -46,4 +29,8 @@
 		<combo_box.item label="自動的�インストール" name="Install_automatically"/>
 		<combo_box.item label="手動�アップデートをダウンロード&amp;インストール" name="Install_manual"/>
 	</combo_box>
+	<text name="Proxy Settings:">
+		プロキシ設定：
+	</text>
+	<button label="プロキシ設定を調整" label_selected="�照" name="set_proxy"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
index 163064484b..35c1148cc1 100644
--- a/indra/newview/skins/default/xui/ja/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="status">
-	<panel.string name="StatBarDaysOfWeek">
-		日曜日:月曜日:�曜日:水曜日:木曜日:金曜日:土曜日
-	</panel.string>
-	<panel.string name="StatBarMonthsOfYear">
-		1月:2月:3月:4月:5月:6月:7月:8月:9月:10月:11月:12月
-	</panel.string>
 	<panel.string name="packet_loss_tooltip">
 		パケット�失
 	</panel.string>
@@ -25,6 +19,10 @@
 		<text name="balance" tool_tip="クリック�� L$ 残高を更新" value="L$20"/>
 		<button label="L$ �購入" name="buyL" tool_tip="クリック�� L$ を購入���"/>
 	</panel>
+	<combo_box name="mode_combo" tool_tip="モードを�択���。ベーシックモード��探索や�ャットを��や�簡��実行���アド�ンスモード���より多��機能�利用����。">
+		<combo_box.item label="ベーシックモード" name="Basic"/>
+		<combo_box.item label="アド�ンスモード" name="Advanced"/>
+	</combo_box>
 	<text name="TimeText" tool_tip="�在時刻（太平洋）">
 		24:00 AM PST
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
index 7edda6e1a3..fc0293307b 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
@@ -2,35 +2,47 @@
 <panel label="も�" name="objects panel">
 	<panel label="" name="sidepanel__inventory_panel">
 		<layout_stack name="inventory_layout_stack">
-			<layout_panel name="inbox_layout_panel">
-				<panel label="" name="marketplace_inbox">
-					<string name="InboxLabelWithArg">
-						�����商�（[NUM]）
-					</string>
-					<string name="InboxLabelNoArg">
-						�����商�
-					</string>
-					<button label="�����商�" name="inbox_btn"/>
-					<text name="inbox_fresh_new_count">
-						[NUM] 新登場
-					</text>
-					<panel tool_tip="Drag and drop items to your inventory to manage and use them">
-						<text name="inbox_inventory_placeholder">
-							マーケットプレイス�ら購入��商��������れ��。
-						</text>
-					</panel>
-				</panel>
-			</layout_panel>
-			<layout_panel name="outbox_layout_panel">
-				<panel label="" name="marketplace_outbox">
-					<button label="マー�ャント�アウトボックス" name="outbox_btn"/>
-					<button label="" name="outbox_sync_btn" tool_tip="自分�マーケットプレイス店頭�移動"/>
-					<panel tool_tip="Drag and drop items here to prepare them for sale on your storefront">
-						<text name="outbox_inventory_placeholder">
-							��機能を使用�る���マー�ャントアカウントをセットアップ������。
-						</text>
-					</panel>
-				</panel>
+			<layout_panel name="inbox_outbox_layout_panel">
+				<layout_stack name="inbox_outbox_layout_stack">
+					<layout_panel name="inbox_layout_panel">
+						<panel label="" name="marketplace_inbox">
+							<string name="InboxLabelWithArg">
+								�����商�（[NUM]）
+							</string>
+							<string name="InboxLabelNoArg">
+								�����商�
+							</string>
+							<button label="�����商�" name="inbox_btn"/>
+							<text name="inbox_fresh_new_count">
+								[NUM] 個�新商�
+							</text>
+							<panel tool_tip="Drag and drop items to your inventory to manage and use them">
+								<text name="inbox_inventory_placeholder">
+									マーケットプレイス�ら購入��商��������れ��。
+								</text>
+							</panel>
+						</panel>
+					</layout_panel>
+					<layout_panel name="outbox_layout_panel">
+						<panel label="" name="marketplace_outbox">
+							<string name="OutboxLabelWithArg">
+								マー�ャント�アウトボックス ([NUM])
+							</string>
+							<string name="OutboxLabelNoArg">
+								マー�ャント�アウトボックス
+							</string>
+							<button label="マー�ャント�アウトボックス" name="outbox_btn"/>
+							<button label="" name="outbox_sync_btn" tool_tip="自分�マーケットプレイス店頭�移動"/>
+							<panel>
+								<panel name="outbox_inventory_placeholder_panel">
+									<text name="outbox_inventory_placeholder_title">
+										ローディング...
+									</text>
+								</panel>
+							</panel>
+						</panel>
+					</layout_panel>
+				</layout_stack>
 			</layout_panel>
 		</layout_stack>
 		<panel name="button_panel">
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index f0c0d99a8e..41dc098ba2 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -339,6 +339,18 @@ support@secondlife.com �����������。
 		アイテム� 1 ������ドラッグ����
 	</string>
 	<string name="TooltipPrice" value="L$[AMOUNT]："/>
+	<string name="TooltipOutboxNoTransfer">
+		�れらオブジェクト� 1 ����複数��別�ユーザー�売り渡��り譲渡����も���。
+	</string>
+	<string name="TooltipOutboxWorn">
+		�����れらオブジェクト� 1 ����複数を装������。ア�ター�ら�れらを�り外����移動��������。
+	</string>
+	<string name="TooltipOutboxFolderLevels">
+		��フォルダ��るサブフォルダ�階層�多����。サブフォルダ�4階層以内（ルートフォルダ�下�A���下�B���下�C���風�）����直������。
+	</string>
+	<string name="TooltipOutboxTooManyObjects">
+		��フォルダ�� 200 個以上�オブジェクト���れ��。商�����をボックス�入れ�オブジェクト数を減ら������。
+	</string>
 	<string name="TooltipHttpUrl">
 		クリック���� Web ページを見��
 	</string>
@@ -1204,8 +1216,65 @@ support@secondlife.com �����������。
 	<string name="InventoryInboxNoItems">
 		マーケットプレイス�購入��商��������れ��。
 	</string>
+	<string name="MarketplaceURL">
+		http://marketplace.[DOMAIN_NAME]
+	</string>
+	<string name="MarketplaceURL_CreateStore">
+		http://marketplace.[DOMAIN_NAME]/create_store
+	</string>
+	<string name="MarketplaceURL_LearnMore">
+		http://marketplace.[DOMAIN_NAME]/learn_more
+	</string>
+	<string name="InventoryOutboxCreationErrorTitle">
+		マー�ャントアウトボックス�正��設定�れ����ん
+	</string>
+	<string name="InventoryOutboxCreationErrorTooltip">
+		マー�ャントアウトボックス�設定エラー
+	</string>
+	<string name="InventoryOutboxCreationError">
+		�題を解決�る��カスタマーサービス�����������。
+	</string>
+	<string name="InventoryOutboxNotMerchantTitle">
+		マーケットプレイス�皆�売り場��
+	</string>
+	<string name="InventoryOutboxNotMerchantTooltip">
+		���もマー�ャント��
+	</string>
+	<string name="InventoryOutboxNotMerchant">
+		[[MARKETPLACE_URL] Second Life マーケットプレイス] ���SL �人�制作��商� 100 万点以上�販売�れ����。���も�自分�自信作や�����購入��アイテムを商����売�����ん�。��手順�簡���セットアップ�無料��。[[LEARN_MORE_URL] ��ら�詳細を確��]�マーケットプレイス�[[CREATE_STORE_URL] ストアを作�] ���ょ�。
+	</string>
+	<string name="InventoryOutboxNoItemsTitle">
+		マーケットプレイス��新��出�方法
+	</string>
+	<string name="InventoryOutboxNoItemsTooltip">
+		商�を���ドラッグアンドドロップ�る����マーケットプレイス�売り物��り��
+	</string>
 	<string name="InventoryOutboxNoItems">
-		マーケットプレイス店頭�掲載�る���準備�������商�をドラッグ���。
+		販売�る商����フォルダを��エリア�ドラッグ���。コピー���アイテム����り�ドラッグ��商��コピー�表示�れる����������物�ら商��実際�移動�る�����り��ん。マーケットプレイス�商�を�る準備�整��ら�「アップロード�ボタンをクリック���。商��マーケットプレイスインベントリ�移動��時点���フォルダ�ら削除�れ��。
+	</string>
+	<string name="Marketplace Error None">
+		エラー��
+	</string>
+	<string name="Marketplace Error Not Merchant">
+		エラー：マーケットプレイス�商�を�る������自身をマー�ャント登録�る必���り��（登録�無料��）。
+	</string>
+	<string name="Marketplace Error Empty Folder">
+		エラー：��フォルダ�空��。
+	</string>
+	<string name="Marketplace Error Unassociated Products">
+		エラー：����マー�ャントアカウント���商��無関係�アイテム�多��る�����アイテムをアップロード����ん���。��エラーを解消�る���マーケットプレイス�ウェブサイト�ログイン��商��関係���アイテム数を減ら������。
+	</string>
+	<string name="Marketplace Error Object Limit">
+		エラー：��商����れるオブジェクト�多����。オブジェクトを����ボックス�����オブジェクト数を200以下�減ら������。
+	</string>
+	<string name="Marketplace Error Folder Depth">
+		エラー：��商���スト入りフォルダ�階層�多����。�スト入りフォルダを 3 階層以内����直������。
+	</string>
+	<string name="Marketplace Error Unsellable Item">
+		エラー：��項目をマーケットプレイス�販売�る�������ん。
+	</string>
+	<string name="Marketplace Error Internal Import">
+		エラー：��商��関���題�発生����。��ら����ら�試�����。
 	</string>
 	<string name="no_transfer" value=" （�販・プレゼント��）"/>
 	<string name="no_modify" value=" （編集��）"/>
@@ -4185,8 +4254,8 @@ www.secondlife.com ã�‹ã‚‰æœ€æ–°ãƒ�ージョンをダウンロードã�—ã�¦ã��ã� ã
 	<string name="Female - Wow">
 		女性 - Wow
 	</string>
-	<string name="/bow">
-		/����る
+	<string name="/bow1">
+		/bow1
 	</string>
 	<string name="/clap">
 		/�手
diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml
index 6ea2daced9..508635cd6e 100644
--- a/indra/newview/skins/default/xui/pt/floater_about.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about.xml
@@ -41,15 +41,23 @@ Versão do servidor de voz: [VOICE_VERSION]
 			<button label="Copiar" name="copy_btn"/>
 		</panel>
 		<panel label="Créditos" name="credits_panel">
-			<text_editor name="credits_editor">
-				O Second Life é o resultado do trabalho de Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les e muitos mais.
-
-Agradecemos também aos seguintes residentes por sua colaboração na mais nova versão do Second Life: Drew Dwi, Zai Lynch, Latif Khalifa, Ellla McMahon, Harleen Gretzky, Squirrel Wood, Malarthi Behemoth, Dante Tucker, Buckaroo Mu, Eddi Decosta, Dirk, Talamasca, Torben Trautman, Irene Muni, Aralara Rajal, Aura Dirval, Cayu Cluny, Eva Rau, FreeSL Aeon, Frontera Thor, Inma Rau, Lunita Savira, Minerva Memel, Polo Gufler, Xiki Luik, Lilly Zenovka, Vick Forcella, Sasy Scarborough, Gentle Welinder, Elric Anatine, Techwolf Lupindo, Dusan Writer, WolfPup Lowenhar, Marianne McCann, Fiachra Lach, Sitearm Madonna, Sudane Erato, Sahkolihaa Contepomi, Sachi Vixen, Questar Utu, Dimitrio Lewis, Matto Destiny, Scrim Pinion, Radio Signals, Psi Merlin, Pixel Gausman, Mel Vanbeeck, Laurent Bechir, Lamorna Proctor, Lares Carter, Gwyneth Llewelyn, Hydra Shaftoe, Holger Gilruth, Gentle Heron, Carla Broek, Boroondas Gupte, Fury Rosewood, Flower Ducatillon, Colpo Wexler, gwampa Lomu, Borg Capalini, Beansy Twine, Ardy Lay, , 45ms Zhong, Adeon Writer, Aeonix Aeon, Ai Austin, Aiko Ying, Alexandrea Fride, Alliez Mysterio, Annie Milestone, Annika Genezzia, Ansariel Hiller, ArminasX Saiman, Arya Braveheart, Asaeda Meltingdots, Asturkon Jua, Avallyn Oakleaf, Avatar Quinzet, BabyA Littlething, Bacchus Ireto, Bazaar, Riva, Benjamin Bigdipper, Beth Walcher, Bezilon Kasei, Biancaluce Robbiani, Bill Walach, blakopal Galicia, Blitzckreed Levenque, Bryn Oh, Callipygian Christensen, Cap Carver, Carr Arbenlow, Chantal Harvey, Charles Courtois, Charlie Sazaland, Cherry Cheevers, ChickyBabes Zuzu, Christopher  Organiser, Ciaran Laval, Clara Young, Celierra Darling, Corinne Helendale, Corro Moseley, Coughdrop Littlething, Darien Caldwell, Dartagan Shepherd, Debs Regent, Decro Schmooz, Denim Kamachi, DiJodi Dubratt, Dil Spitz, Edgware Marker, Egehan Dryke, Emma Portilo, Emmie Fairymeadow, Evangelista Emerald, Faelon Swordthain, Frenchimmo Sabra, Gaberoonie Zanzibar, Ganymedes Costagravas, Gene Frostbite, GeneJ Composer, Giggles Littlebird, Grady Echegaray, Guni Greenstein, Gypsy Tripsa, Hackshaven Harford, Ham Rambler, Han Shuffle, Hanglow Short, Hatzfeld Runo, herina Bode, Horatio Freund, Hypatia Callisto, Hypatia Pickens, Identity Euler, Imnotgoing Sideways, Innula Zenovka, Iyoba Tarantal, Jack Abraham, Jagga Meredith, Jennifer Boyle, Jeremy Marquez, Jessica Qin, Jinx Nordberg, Jo Bernandes, Jocial Sonnenkern, Joel Savard, Jondan Lundquist, Josef Munster, Josette Windlow, Juilan Tripsa, Juro Kothari, Justin RiversRunRed, Kagehi Kohn, Kaimen Takahe, Keklily Longfall, Ken Lavender, Kestral Karas, Khisme Nitely, Kimar Coba, Kithrak Kirkorian, Kitty Barnett, Kolor Fall, Komiko Okamoto, Korvel Noh, Larry Pixel, Leal Choche, len Starship, Lenae Munz, Lexi Frua, Lillie Cordeaux, Lizzy Macarthur, LSL Scientist, Luban Yiyuan, Luc Starsider, Maccus McCullough, Madison Blanc, Maggie Darwin, Mallory Destiny, Manx Wharton, Marc Claridge, Marc2 Sands, Matthew Anthony, Maxim RiversRunRed, Medhue Simoni, Melinda Latynina, Mencius Watts, Michi Lumin, Midian Farspire, Miles Glaz, Mindy Mathy, Mitch Wagner, Mo Hax, Mourna Biziou, Nao Noe, naofan Teardrop, Naomah Beaumont, Nathiel Siamendes, Nber Medici, Neko Link, Netpat Igaly, Neutron Chesnokov, Newfie Pendragon, Nicholai Laviscu, Nick Rhodes, Nicoladie Gymnast, Ollie Kubrick, Orenj Marat, Orion Delphis, Oryx Tempel, Parvati Silverweb, PeterPunk Mooney, Pixel Scientist, Pounce Teazle, Professor Noarlunga, Quantum Destiny, Quicksilver Hermes, Ralf Setsuko, RAT Quan, RedMokum Bravin, Revolution Perenti, Rezit Sideways, Rich Grainger, Rosco Teardrop, Rose Evans, Rudee Voom, RufusTT Horsefly, Saii Hallard, SaintLEOlions Zimer, Samm Larkham, Satanello Miami, SexySteven Morrisey, Sheet Spotter, Shnurui Troughton, sicarius Thorne, Sicarius Toxx, Sini Nubalo, SLB Wirefly, snowy Sidran, Soupa Segura, ST Mensing, Starshine Halasy, Stickman Ingmann, Synystyr Texan, Takeda Terrawyng, Tali Rosca, Templar Merlin, Tezcatlipoca Bisiani, Tiel Stonecutter, Tony Kembia, TouchaHoney Perhaps, Trey Reanimator, TriloByte Zanzibar, Trinity Dechou, Trinity Dejavu, Unlikely Quintessa, UsikuFarasi Kanarik, Veritas Raymaker, Vex Streeter, Viaticus Speculaas, Villain Baroque, Vixie Durant, Void Singer, Watty Berkson, Westley Schridde, Westley Streeter, Whimsy Winx, Winter Ventura, Wundur Primbee, xstorm Radek, YongYong Francois, Zak Westminster, Zana Kohime, Zaren Alexander, Zeja Pyle, ZenMondo Wormser, Zoex Flanagan e muitos mais.
-
-
-
-
-&quot;O trabalho continua, a causa vive, a esperança persiste, e os sonhos nunca morrem&quot; - Edward Kennedy
+			<text name="linden_intro">
+				O Second Life é trazido a você pela Lindens:
+			</text>
+			<text_editor name="linden_names">
+				Philip, Andrew, Doug, Richard, Phoenix, Ian, Mark, Robin, Dan, Char, Ryan, Eric, Jim, Lee, Jeff, Michael, Kelly, Steve, Catherine, Bub, Ramzi, Jill, Jeska, Don, Kona, Callum, Charity, Jack, Shawn, babbage, James, Lauren, Blue, Brent, Reuben, Pathfinder, Jesse, Patsy, Torley, Bo, Cyn, Jonathan, Gia, Annette, Ginsu, Harry, Lex, Runitai, Guy, Cornelius, Beth, Swiss, Thumper, Wendy, Teeple, Seth, Dee, Mia, Sally, Liana, Aura, Beez, Milo, Red, Gulliver, Marius, Joe, Jose, Dore, Justin, Nora, Morpheus, Lexie, Amber, Chris, Xan, Leyla, Walker, Sabin, Joshua, Hiromi, Tofu, Fritz, June, Jean, Ivy, Dez, Ken, Betsy, Which, Spike, Rob, Zee, Dustin, George, Claudia, del, Matthew, jane, jay, Adrian, Yool, Rika, Yoz, siobhan, Qarl, Benjamin, Beast, Everett, madhavi, Christopher, Izzy, stephany, Jeremy, sean, adreanne, Pramod, Tobin, sejong, Iridium, maurice, kj, Meta, kari, JP, bert, kyle, Jon, Socrates, Bridie, Ivan, maria, Aric, Coco, Periapse, sandy, Storrs, Lotte, Colossus, Brad, Pastrami, Zen, BigPapi, Banzai, Sardonyx, Mani, Garry, Jaime, Neuro, Samuel, Niko, CeeLo, Austin, Soft, Poppy, emma, tessa, angelo, kurz, alexa, Sue, CG, Blake, Erica, Brett, Bevis, kristen, Q, simon, Enus, MJ, laurap, Kip, Scouse, Ron, Ram, kend, Marty, Prospero, melissa, kraft, Nat, Seraph, Hamilton, Lordan, Green, miz, Ashlei, Trinity, Ekim, Echo, Charlie, Rowan, Rome, Jt, Doris, benoc, Christy, Bao, Kate, Tj, Patch, Cheah, Johan, Brandy, Angela, Oreh, Cogsworth, Lan, Mitchell, Space, Bambers, Einstein, Bender, Malbers, Matias, Maggie, Rothman, Milton, Niall, Marin, Allison, Mango, Andrea, Katt, Yi, Ambroff, Rico, Raymond, Gail, Christa, William, Dawn, Usi, Dynamike, M, Corr, Dante, Molly, kaylee, Danica, Kelv, Lil, jacob, Nya, Rodney, elsie, Blondin, Grant, Nyx, Devin, Monty, Minerva, Keira, Katie, Jenn, Makai, Clare, Joy, Cody, Gayathri, FJ, spider, Oskar, Landon, Jarv, Noelle, Al, Doc, Gray, Vir, t, Maestro, Simone, Shannon, yang, Courtney, Scott, charlene, Quixote, Susan, Zed, Amanda, Katelin, Esbee, JoRoan, Enkidu, roxie, Scarlet, Merov, Kevin, Judy, Rand, Newell, Les, Dessie, Galen, Michon, Geo, Siz, Calyle, Pete, Praveen, Callen, Sheldon, Pink, Nelson, jenelle, Terrence, Nathan, Juan, Sascha, Huseby, Karina, Kaye, Kotler, Lis, Darv, Charrell, Dakota, Kimmora, Theeba, Taka, Mae, Perry, Ducot, dana, Esther, Dough, gisele, Doten, Viale, Fisher, jessieann, ashley, Torres, delby, rountree, kurt, Slaton, Madison, Rue, Gino, Wen, Casssandra, Brodesky, Squid, Gez, Rakesh, Gecko, Ladan, Tony, Tatem, Squire, Falcon, BK, Crimp, Tiggs, Bacon, Coyot, Carmilla, Webb, Sea, Arch, Jillian, Jason, Bernard, Vogt, Peggy, dragon, Pup, xandix, Wallace, Bewest, Inoshiro, Rhett, AG, Aimee, Ghengis, Itiaes, Eli, Steffan, Epic, Grapes, Stone, Prep, Scobu, Robert, Alain, Carla, Vicky, Tia, Alec, Taras, Lisa, Oz, Ariane, Log, House, Kazu, Kim, Drofnas, Tyler, Campbell, Michele, Madeline, Nelly, Baron, Thor, Lori, Hele, Fredrik, Teddy, Pixie, Berry, Gabrielle, Alfonso, Brooke, Wolf, Ringo, Cru, Charlar, Rodvik, Gibson, Elise, Bagman, Greger, Leonidas, Jerm, Leslie, CB, Brenda, Durian, Carlo, mm, Zeeshan, Caleb, Max, Elikak, Mercille, Steph, Chase
+			</text_editor>
+			<text name="contrib_intro">
+				com contribuições de código aberto de:
+			</text>
+			<text_editor name="contrib_names">
+				Dummy Name substituído durante a execução
+			</text_editor>
+			<text name="trans_intro">
+				e traduções de:
+			</text>
+			<text_editor name="trans_names">
+				Dummy Name substituído durante a execução
 			</text_editor>
 		</panel>
 		<panel label="Licenças" name="licenses_panel">
diff --git a/indra/newview/skins/default/xui/pt/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/pt/floater_preferences_proxy.xml
new file mode 100644
index 0000000000..3aaee2d4a7
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_preferences_proxy.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Proxy Settings Floater" title="Configurações de proxy">
+	<check_box initial_value="false" label="Use proxy HTTP para páginas da Web" name="web_proxy_enabled"/>
+	<text name="http_proxy_label">
+		Proxy HTTP:
+	</text>
+	<line_editor name="web_proxy_editor" tool_tip="O nome DNS ou endereço IP do proxy HTTP que você deseja usar."/>
+	<spinner label="Porta:" name="web_proxy_port" tool_tip="A porta do proxy HTTP que você deseja usar."/>
+	<check_box label="Use o proxy SOCKS 5 para tráfego de UDP" name="socks_proxy_enabled"/>
+	<text name="socks5_proxy_label">
+		Proxy SOCKS 5:
+	</text>
+	<line_editor name="socks_proxy_editor" tool_tip="O nome DNS ou endereço IP do proxy SOCKS 5 que você deseja usar."/>
+	<spinner label="Porta:" name="socks_proxy_port" tool_tip="A porta do proxy SOCKS 5 que você deseja usar."/>
+	<text name="socks_auth_label">
+		Autenticação SOCKS:
+	</text>
+	<radio_group name="socks5_auth_type">
+		<radio_item label="Sem autenticação" name="Socks5NoAuth" tool_tip="O proxy Socks5 não requer autenticação." value="Nenhum"/>
+		<radio_item label="Nome de usuário/senha" name="Socks5UserPass" tool_tip="O proxy Socks5 requer autenticação de nome de usuário/senha." value="UserPass"/>
+	</radio_group>
+	<text name="socks5_username_label">
+		Nome de usuário:
+	</text>
+	<text name="socks5_password_label">
+		Senha:
+	</text>
+	<line_editor name="socks5_username" tool_tip="O nome de usuário usado para autenticar seu servidor SOCKS 5"/>
+	<line_editor name="socks5_password" tool_tip="A senha usada para autenticar seu servidor SOCKS 5"/>
+	<text name="other_proxy_label">
+		Outro proxy de tráfego HTTP:
+	</text>
+	<radio_group name="other_http_proxy_type">
+		<radio_item label="Não enviar para proxy" name="OtherNoProxy" tool_tip="O tráfego HTTP que não seja da Web NÃO será enviado a qualquer proxy." value="Nenhum"/>
+		<radio_item label="Usar proxy HTTP" name="OtherHTTPProxy" tool_tip="O HTTP que não seja da Web será enviado por meio do proxy da Web configurado." value="Web"/>
+		<radio_item label="Usar proxy SOCKS 5" name="OtherSocksProxy" tool_tip="O HTTP que não seja da Web será enviado por meio do proxy Socks 5 configurado." value="Socks"/>
+	</radio_group>
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/menu_inventory.xml b/indra/newview/skins/default/xui/pt/menu_inventory.xml
index 7aa3b836a4..ba3879b5a1 100644
--- a/indra/newview/skins/default/xui/pt/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/menu_inventory.xml
@@ -83,5 +83,7 @@
 	<menu_item_call label="Editar" name="Wearable Edit"/>
 	<menu_item_call label="Adicionar" name="Wearable Add"/>
 	<menu_item_call label="Tirar" name="Take Off"/>
+	<menu_item_call label="Copiar para Caixa de saída do lojista" name="Merchant Copy"/>
+	<menu_item_call label="Mover para Caixa de saída do lojista" name="Merchant Move"/>
 	<menu_item_call label="--Sem opções--" name="--no options--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_media_ctrl.xml b/indra/newview/skins/default/xui/pt/menu_media_ctrl.xml
index 44117c8865..ac84b02870 100644
--- a/indra/newview/skins/default/xui/pt/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/pt/menu_media_ctrl.xml
@@ -3,4 +3,5 @@
 	<menu_item_call label="Cortar" name="Cut"/>
 	<menu_item_call label="Cortar" name="Copy"/>
 	<menu_item_call label="Colar" name="Paste"/>
+	<menu_item_call label="Abrir o Web Inspector" name="open_webinspector"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_mode_change.xml b/indra/newview/skins/default/xui/pt/menu_mode_change.xml
new file mode 100644
index 0000000000..314d3e409b
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_mode_change.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Mode Change">
+	<menu_item_check label="Básico" name="BasicMode"/>
+	<menu_item_check label="Avançado" name="AdvancedMode"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index ea54afed5e..e1d066261a 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -138,7 +138,6 @@
 			<menu_item_call label="Som (L$[COST])..." name="Upload Sound"/>
 			<menu_item_call label="Animação (L$[COST])..." name="Upload Animation"/>
 			<menu_item_call label="Modelar..." name="Upload Model"/>
-			<menu_item_call label="Assistente de modelagem..." name="Upload Model Wizard"/>
 			<menu_item_call label="Volume (L$[COST] por arquivo)..." name="Bulk Upload"/>
 		</menu>
 		<menu_item_call label="Desfazer" name="Undo"/>
@@ -248,6 +247,7 @@
 			<menu_item_check label="Mostrar info da textura" name="Show Texture Info"/>
 			<menu_item_check label="Mostrar cor sob o cursor" name="Show Color Under Cursor"/>
 			<menu_item_check label="Mostrar memória" name="Show Memory"/>
+			<menu_item_check label="Exibir informações de memória privadas" name="Show Private Mem Info"/>
 			<menu_item_check label="Mostrar mudanças a objetos" name="Show Updates"/>
 		</menu>
 		<menu label="Force an Error" name="Force Errors">
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index 22de7edfdd..70d882822d 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -84,6 +84,19 @@ Verifique se a conexão à internet está funcionando.
 		Salvar modificações?
 		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Não salvar" yestext="Salvar"/>
 	</notification>
+	<notification name="ConfirmNoCopyToOutbox">
+		Você não tem permissão para copiar este item para a Caixa de saída do lojista. Tem certeza de que deseja mover o itens a seguir?
+        [ITEM_NAME]
+		<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
+	</notification>
+	<notification name="OutboxUploadComplete">
+		Envio para Mercado concluído.
+		<usetemplate name="okbutton" yestext="Viva!"/>
+	</notification>
+	<notification name="OutboxUploadHadErrors">
+		Envio para Mercado concluído com erros!  Corrija os problemas em sua caixa de saída e tente novamente. Obrigado.
+		<usetemplate name="okbutton" yestext="Tudo bem!"/>
+	</notification>
 	<notification name="CompileQueueSaveText">
 		Houve um problema com o carregamento do texto para um script devido à seguinte razão: [REASON]. Por favor, tente novamente mais tarde.
 	</notification>
@@ -2400,12 +2413,20 @@ Por favor, tente novamente em alguns instantes.
 		Nenhum lote válido foi encontrado.
 	</notification>
 	<notification name="ObjectGiveItem">
-		Um objeto chamado &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;, de [NAME_SLURL], lhe deu este(a) [OBJECTTYPE]:
+		Um objeto chamado &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;, de [NAME_SLURL], obteve este(a) [OBJECTTYPE]:
 &lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
 		<form name="form">
 			<button name="Keep" text="Segure"/>
 			<button name="Discard" text="Descarte"/>
-			<button name="Mute" text="Bloquear"/>
+			<button name="Mute" text="Bloquear proprietário"/>
+		</form>
+	</notification>
+	<notification name="OwnObjectGiveItem">
+		O objeto chamado &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;, de [NAME_SLURL], obteve este(a) [OBJECTTYPE]:
+&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
+		<form name="form">
+			<button name="Keep" text="Manter"/>
+			<button name="Discard" text="Descartar"/>
 		</form>
 	</notification>
 	<notification name="UserGiveItem">
@@ -2549,6 +2570,7 @@ Deseja aceitar?
 		&apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; de [NAME]
 [MESSAGE]
 		<form name="form">
+			<button name="Mute" text="Bloquear"/>
 			<button name="Ignore" text="Ignorar"/>
 		</form>
 	</notification>
@@ -2556,6 +2578,7 @@ Deseja aceitar?
 		&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; de [GROUPNAME]&apos;
 [MESSAGE]
 		<form name="form">
+			<button name="Mute" text="Bloquear"/>
 			<button name="Ignore" text="Ignorar"/>
 		</form>
 	</notification>
@@ -2883,6 +2906,12 @@ Se o botão Falar for ocultado, o recurso de voz será desabilitado.
 	<notification label="Você tem dólares Linden!" name="HintLindenDollar">
 		Seu saldo de L$ está aqui.  Clique em Comprar L$ para trocar mais dólares Linden.
 	</notification>
+	<notification name="LowMemory">
+		Seu pool de memória está baixo. Algumas funções do SL foram desativadas para evitar falhas. Encerre os outros aplicativos. Reinicie o SL se o problema persistir.
+	</notification>
+	<notification name="ForceQuitDueToLowMemory">
+		O SL será encerrado em 30 segundos devido falta de memória.
+	</notification>
 	<notification name="PopupAttempt">
 		Um pop-up foi bloqueado.
 		<form name="form">
@@ -2890,6 +2919,54 @@ Se o botão Falar for ocultado, o recurso de voz será desabilitado.
 			<button name="open" text="Abrir pop-up"/>
 		</form>
 	</notification>
+	<notification name="SOCKS_NOT_PERMITTED">
+		O proxy SOCKS 5 &quot;[HOST]:[PORT]&quot; recusou a conexão, não permitida pelo conjunto de regras.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_CONNECT_ERROR">
+		O proxy SOCKS 5 &quot;[HOST]:[PORT]&quot; recusou a conexão. Não foi possível abrir o canal TCP.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_NOT_ACCEPTABLE">
+		O proxy SOCKS 5 &quot;[HOST]:[PORT]&quot; recusou o sistema de autenticação selecionado.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_AUTH_FAIL">
+		O proxy SOCKS 5 &quot;[HOST]:[PORT]&quot; informou que suas credenciais são inválidas.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_UDP_FWD_NOT_GRANTED">
+		O proxy SOCKS 5 &quot;[HOST]:[PORT]&quot; recusou a solicitação de UDP ASSOCIATE.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_HOST_CONNECT_FAILED">
+		Não foi possível conectar-se ao servidor de proxy SOCKS 5 &quot;[HOST]:[PORT]&quot;.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_UNKNOWN_STATUS">
+		Erro desconhecido de proxy com o servidor &quot;[HOST]:[PORT]&quot;.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_INVALID_HOST">
+		Endereço de proxy SOCKS ou porta &quot;[HOST]:[PORT]&quot; inválidos.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="SOCKS_BAD_CREDS">
+		Nome de usuário ou senha de SOCKS 5 inválidos.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="PROXY_INVALID_HTTP_HOST">
+		Endereço de proxy HTTP ou porta &quot;[HOST]:[PORT]&quot; inválidos.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="PROXY_INVALID_SOCKS_HOST">
+		Endereço de proxy SOCKS ou porta &quot;[HOST]:[PORT]&quot; inválidos.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="ChangeProxySettings">
+		As configurações de proxy terão efeito depois que [APP_NAME] for reiniciado.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="AuthRequest">
 		O site em &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; em &apos;[REALM]&apos; requer nome e senha.
 		<form name="form">
diff --git a/indra/newview/skins/default/xui/pt/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/pt/panel_outbox_inventory.xml
new file mode 100644
index 0000000000..442622035a
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_outbox_inventory.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<outbox_inventory_panel name="inventory_outbox" tool_tip="Arraste e solte os itens aqui para prepará-los para venda na frente da sua loja"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
index d8d4a8fc1c..9259c0ed56 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
@@ -11,17 +11,6 @@
 	</text>
 	<check_box label="Personalizar porta" name="connection_port_enabled"/>
 	<spinner label="Número da porta:" name="connection_port"/>
-	<text name="cache_size_label_l">
-		Tamanho do cache
-	</text>
-	<text name="text_box5">
-		MB
-	</text>
-	<text name="Cache location">
-		Localização do cache:
-	</text>
-	<button label="Procurar" label_selected="Procurar" name="set_cache"/>
-	<button label="Redefinir" label_selected="Redefinir" name="reset_cache"/>
 	<text name="Web:">
 		Web:
 	</text>
@@ -33,12 +22,6 @@
 	<check_box initial_value="true" label="Aceitar cookies" name="cookies_enabled"/>
 	<check_box initial_value="true" label="Habilitar Javascript" name="browser_javascript_enabled"/>
 	<check_box initial_value="falso" label="Ativar pop-ups no navegador de mídia" name="media_popup_enabled"/>
-	<check_box initial_value="false" label="Ativar web proxy" name="web_proxy_enabled"/>
-	<text name="Proxy location">
-		Localização do proxy:
-	</text>
-	<line_editor name="web_proxy_editor" tool_tip="O nome ou endereço IP do proxy da sua preferência"/>
-	<spinner label="Porta:" name="web_proxy_port"/>
 	<text name="Software updates:">
 		Atualizações de software:
 	</text>
@@ -46,4 +29,8 @@
 		<combo_box.item label="Instalar automaticamente" name="Install_automatically"/>
 		<combo_box.item label="Baixar e instalar atualizações manualmente" name="Install_manual"/>
 	</combo_box>
+	<text name="Proxy Settings:">
+		Configurações de proxy:
+	</text>
+	<button label="Ajustar configurações de proxy" label_selected="Procurar" name="set_proxy"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_status_bar.xml b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
index f7890ae57d..0d0f8cbf19 100644
--- a/indra/newview/skins/default/xui/pt/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="status">
-	<panel.string name="StatBarDaysOfWeek">
-		Domingo:Segunda-feira:Terça-feira:Quarta-feira:Quinta-feira:Sexta-feira:Sábado
-	</panel.string>
-	<panel.string name="StatBarMonthsOfYear">
-		Janeiro:Fevereiro:Março:Abril:Maio:Junho:Julho:Agosto:Setembro:Outubro:Novembro:Dezembro
-	</panel.string>
 	<panel.string name="packet_loss_tooltip">
 		Perda de pacote
 	</panel.string>
@@ -25,6 +19,10 @@
 		<text name="balance" tool_tip="Atualizar saldo de L$" value="L$20"/>
 		<button label="Comprar L$" name="buyL" tool_tip="Comprar mais L$"/>
 	</panel>
+	<combo_box name="mode_combo" tool_tip="Selecione o modo. O modo Básico é mais rápido e ideal para explorar e conversar. Use o modo Avançado para acessar mais recursos.">
+		<combo_box.item label="Modo básico" name="Basic"/>
+		<combo_box.item label="Modo avançado" name="Advanced"/>
+	</combo_box>
 	<text name="TimeText" tool_tip="Hora atual (Pacífico)">
 		24:00 AM PST
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml
index 988e7c7076..77c552a852 100644
--- a/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml
@@ -2,35 +2,47 @@
 <panel label="Coisas" name="objects panel">
 	<panel label="" name="sidepanel__inventory_panel">
 		<layout_stack name="inventory_layout_stack">
-			<layout_panel name="inbox_layout_panel">
-				<panel label="" name="marketplace_inbox">
-					<string name="InboxLabelWithArg">
-						Itens recebidos ([NUM])
-					</string>
-					<string name="InboxLabelNoArg">
-						Itens recebidos
-					</string>
-					<button label="Itens recebidos" name="inbox_btn"/>
-					<text name="inbox_fresh_new_count">
-						[NUM] novos
-					</text>
-					<panel tool_tip="Drag and drop items to your inventory to manage and use them">
-						<text name="inbox_inventory_placeholder">
-							Compras do marketplace serão entregues aqui.
-						</text>
-					</panel>
-				</panel>
-			</layout_panel>
-			<layout_panel name="outbox_layout_panel">
-				<panel label="" name="marketplace_outbox">
-					<button label="Caixa de saída de comerciante" name="outbox_btn"/>
-					<button label="" name="outbox_sync_btn" tool_tip="Enviar para minha vitrine no Marketplace"/>
-					<panel tool_tip="Drag and drop items here to prepare them for sale on your storefront">
-						<text name="outbox_inventory_placeholder">
-							Abra uma conta de comerciante para usar este recurso.
-						</text>
-					</panel>
-				</panel>
+			<layout_panel name="inbox_outbox_layout_panel">
+				<layout_stack name="inbox_outbox_layout_stack">
+					<layout_panel name="inbox_layout_panel">
+						<panel label="" name="marketplace_inbox">
+							<string name="InboxLabelWithArg">
+								Itens recebidos ([NUM])
+							</string>
+							<string name="InboxLabelNoArg">
+								Itens recebidos
+							</string>
+							<button label="Itens recebidos" name="inbox_btn"/>
+							<text name="inbox_fresh_new_count">
+								[NUM] novo(s)
+							</text>
+							<panel tool_tip="Drag and drop items to your inventory to manage and use them">
+								<text name="inbox_inventory_placeholder">
+									Compras do marketplace serão entregues aqui.
+								</text>
+							</panel>
+						</panel>
+					</layout_panel>
+					<layout_panel name="outbox_layout_panel">
+						<panel label="" name="marketplace_outbox">
+							<string name="OutboxLabelWithArg">
+								Caixa de saída do lojista ([NUM])
+							</string>
+							<string name="OutboxLabelNoArg">
+								Caixa de saída do lojista
+							</string>
+							<button label="Caixa de saída do lojista" name="outbox_btn"/>
+							<button label="" name="outbox_sync_btn" tool_tip="Enviar para a frente do meu mercado"/>
+							<panel>
+								<panel name="outbox_inventory_placeholder_panel">
+									<text name="outbox_inventory_placeholder_title">
+										Carregando...
+									</text>
+								</panel>
+							</panel>
+						</panel>
+					</layout_panel>
+				</layout_stack>
 			</layout_panel>
 		</layout_stack>
 		<panel name="button_panel">
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 2f3b438564..cffe92461b 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -288,6 +288,18 @@ Titulares de contas gratuitas não poderão acessar o Second Life para acomodar
 		Apenas um item único pode ser arrastado para este local
 	</string>
 	<string name="TooltipPrice" value="L$[AMOUNT]"/>
+	<string name="TooltipOutboxNoTransfer">
+		Um ou mais objetos não podem ser vendidos ou transferidos para outros usuário.
+	</string>
+	<string name="TooltipOutboxWorn">
+		Você está usando um ou mais desses objetos. Remova-os de seu avatar e tente movê-los novamente.
+	</string>
+	<string name="TooltipOutboxFolderLevels">
+		Esta pasta tem muitos níveis de subpastas. Reorganize as pastas internas em até 4 níveis no máximo (Pasta raiz contém A que contém B que contém C).
+	</string>
+	<string name="TooltipOutboxTooManyObjects">
+		Esta pasta contém mais de 200 objetos. Embale alguns dos itens para reduzir a contagem de objetos.
+	</string>
 	<string name="TooltipHttpUrl">
 		Clique para ver a página web
 	</string>
@@ -1144,8 +1156,65 @@ Titulares de contas gratuitas não poderão acessar o Second Life para acomodar
 	<string name="InventoryInboxNoItems">
 		Compras do marketplace serão entregues aqui.
 	</string>
+	<string name="MarketplaceURL">
+		http://marketplace.[DOMAIN_NAME]
+	</string>
+	<string name="MarketplaceURL_CreateStore">
+		http://marketplace.[DOMAIN_NAME]/create_store
+	</string>
+	<string name="MarketplaceURL_LearnMore">
+		http://marketplace.[DOMAIN_NAME]/learn_more
+	</string>
+	<string name="InventoryOutboxCreationErrorTitle">
+		Sua Caixa de saída do lojista não está configurada corretamente
+	</string>
+	<string name="InventoryOutboxCreationErrorTooltip">
+		Erro de configuração na Caixa de saída do lojista
+	</string>
+	<string name="InventoryOutboxCreationError">
+		Entre em contato com o Atendimento para corrigir o problema.
+	</string>
+	<string name="InventoryOutboxNotMerchantTitle">
+		Qualquer um pode vender itens no Mercado
+	</string>
+	<string name="InventoryOutboxNotMerchantTooltip">
+		Torne-se um lojista!
+	</string>
+	<string name="InventoryOutboxNotMerchant">
+		[[MARKETPLACE_URL] O Mercado do Second Life] oferece mais de um milhão de produtos virtuais para venda, todos criados pelos residentes. Você também pode vender os itens que você cria, além de alguns itens que comprou. É fácil e a configuração é gratuita. [[LEARN_MORE_URL] Saiba mais] ou [[CREATE_STORE_URL] crie uma loja] no Mercado para começar.
+	</string>
+	<string name="InventoryOutboxNoItemsTitle">
+		Uma nova maneira de vender os itens no Mercado
+	</string>
+	<string name="InventoryOutboxNoItemsTooltip">
+		Arraste e solte os itens aqui para prepará-los para venda no Mercado
+	</string>
 	<string name="InventoryOutboxNoItems">
-		Arraste seus itens aqui para preparar sua listagem na sua vitrine do Marketplace.
+		Arraste os itens ou pastas que deseja vender para esta área. Será exibida uma cópia deles, deixando seu inventário inalterado, a menos que você arraste um item que não permita cópia. Quando estiver pronto para enviar os itens para o Mercado, clique no botão Enviar. Quando os itens tiverem sido movidos para seu Inventário de mercado, eles desaparecerão desta pasta.
+	</string>
+	<string name="Marketplace Error None">
+		Sem erros
+	</string>
+	<string name="Marketplace Error Not Merchant">
+		Erro: antes de enviar os itens para o Mercado, é necessário que você se defina como um lojista (sem custos).
+	</string>
+	<string name="Marketplace Error Empty Folder">
+		Erro: esta pasta está vazia.
+	</string>
+	<string name="Marketplace Error Unassociated Products">
+		Erro: ocorreu uma falha ao enviar este item, pois sua conta de lojista tem muitos itens não associados a produtos. Para corrigir esse erro, faça o login no site do mercado e reduza a contagem de itens não associados.
+	</string>
+	<string name="Marketplace Error Object Limit">
+		Erro: este item contém muitos objetos. Corrija esse erro unindo os objetos em caixa para reduzir a contagem total a menos de 200.
+	</string>
+	<string name="Marketplace Error Folder Depth">
+		Erro: este item contém muitos níveis de pastas aninhadas. Reorganize-o em até 3 níveis de pastas aninhadas, no máximo.
+	</string>
+	<string name="Marketplace Error Unsellable Item">
+		Erro: este item não pode ser vendido no mercado.
+	</string>
+	<string name="Marketplace Error Internal Import">
+		Erro: ocorreu um problema com este item. Tente novamente mais tarde.
 	</string>
 	<string name="no_transfer" value="(não transferível)"/>
 	<string name="no_modify" value="(não modificável)"/>
@@ -4046,7 +4115,7 @@ Denunciar abuso
 	<string name="Female - Wow">
 		Wow - feminino
 	</string>
-	<string name="/bow">
+	<string name="/bow1">
 		/reverência
 	</string>
 	<string name="/clap">
diff --git a/indra/newview/skins/default/xui/zh/floater_about_land.xml b/indra/newview/skins/default/xui/zh/floater_about_land.xml
index e59a23fda0..2568d492f0 100644
--- a/indra/newview/skins/default/xui/zh/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about_land.xml
@@ -90,19 +90,19 @@
 				群組：
 			</text>
 			<button label="設定" name="Set..."/>
-			<check_box label="Allow Deed to Group" name="check deed" tool_tip="A group officer can deed this land to the group, so it will be supported by the group&apos;s land allocation."/>
-			<button label="Deed" name="Deed..." tool_tip="You may only deed land if you are an officer in the selected group."/>
+			<check_box label="�許讓渡給群組" name="check deed" tool_tip="A group officer can deed this land to the group, so it will be supported by the group&apos;s land allocation."/>
+			<button label="讓渡" name="Deed..." tool_tip="You may only deed land if you are an officer in the selected group."/>
 			<check_box label="Owner Makes Contribution With Deed" name="check contrib" tool_tip="When the land is deeded to the group, the former owner contributes enough land allocation to support it."/>
 			<text name="For Sale:">
 				出售：
 			</text>
 			<text name="Not for sale.">
-				Not for sale
+				�出售
 			</text>
 			<text name="For Sale: Price L$[PRICE].">
 				Price: L$[PRICE] (L$[PRICE_PER_SQM]/m²)
 			</text>
-			<button label="Sell Land" name="Sell Land..."/>
+			<button label="出售土地" name="Sell Land..."/>
 			<text name="For sale to">
 				出售給：[BUYER]
 			</text>
@@ -134,7 +134,7 @@
 			<button label="購買土地" name="Buy Land..."/>
 			<button label="腳本資訊" name="Scripts..."/>
 			<button label="為群組購買" name="Buy For Group..."/>
-			<button label="購買通行權" name="Buy Pass..." tool_tip="A pass gives you temporary access to this land."/>
+			<button label="購買通行權" name="Buy Pass..." tool_tip="通行權�許你暫時�出入這塊土地。"/>
 			<button label="放棄土地" name="Abandon Land..."/>
 			<button label="Reclaim Land" name="Reclaim Land..."/>
 			<button label="Linden Sale" name="Linden Sale..." tool_tip="Land must be owned, set content, and not already for auction."/>
@@ -212,31 +212,31 @@
 				Region Object Bonus Factor: [BONUS]
 			</text>
 			<text name="Simulator primitive usage:">
-				Primitive usage:
+				幾何元件使用：
 			</text>
 			<text name="objects_available">
-				[COUNT] out of [MAX] ([AVAILABLE] available)
+				使用　[MAX]　中的 [COUNT] （剩餘 [AVAILABLE] �用）
 			</text>
 			<text name="Primitives parcel supports:">
-				Prims parcel supports:
+				地段所�供的幾何元件數：
 			</text>
 			<text name="object_contrib_text">
 				[COUNT]
 			</text>
 			<text name="Primitives on parcel:">
-				Prims on parcel:
+				地段上的幾何元件數：
 			</text>
 			<text name="total_objects_text">
 				[COUNT]
 			</text>
 			<text name="Owned by parcel owner:">
-				Owned by parcel owner:
+				地段�有者所�有：
 			</text>
 			<text name="owner_objects_text">
 				[COUNT]
 			</text>
 			<button label="顯示" label_selected="顯示" name="ShowOwner"/>
-			<button label="退回" name="ReturnOwner..." tool_tip="Return objects to their owners."/>
+			<button label="退回" name="ReturnOwner..." tool_tip="退回物件給它們的�有者。"/>
 			<text name="Set to group:">
 				設定群組：
 			</text>
@@ -244,15 +244,15 @@
 				[COUNT]
 			</text>
 			<button label="顯示" label_selected="顯示" name="ShowGroup"/>
-			<button label="退回" name="ReturnGroup..." tool_tip="Return objects to their owners."/>
+			<button label="退回" name="ReturnGroup..." tool_tip="退回物件給它們的�有者。"/>
 			<text name="Owned by others:">
-				Owned by others:
+				其他人所�有：
 			</text>
 			<text name="other_objects_text">
 				[COUNT]
 			</text>
 			<button label="顯示" label_selected="顯示" name="ShowOther"/>
-			<button label="退回" name="ReturnOther..." tool_tip="Return objects to their owners."/>
+			<button label="退回" name="ReturnOther..." tool_tip="退回物件給它們的�有者。"/>
 			<text name="Selected / sat upon:">
 				Selected / sat upon:
 			</text>
@@ -263,9 +263,9 @@
 				Auto return other Residents&apos; objects (minutes, 0 for off):
 			</text>
 			<text name="Object Owners:">
-				Object Owners:
+				物件�有者：
 			</text>
-			<button name="Refresh List" tool_tip="Refresh Object List"/>
+			<button name="Refresh List" tool_tip="刷新物件清單"/>
 			<button label="退回物件" name="Return objects..."/>
 			<name_list name="owner list">
 				<name_list.columns label="Type" name="type"/>
@@ -276,14 +276,14 @@
 		</panel>
 		<panel label="�項" name="land_options_panel">
 			<panel.string name="search_enabled_tooltip">
-				Let people see this parcel in search results
+				讓其他人�以在�尋�果中看到這塊地段
 			</panel.string>
 			<panel.string name="search_disabled_small_tooltip">
 				This option is disabled because this parcel&apos;s area is 128 m² or smaller.
 Only large parcels can be listed in search.
 			</panel.string>
 			<panel.string name="search_disabled_permissions_tooltip">
-				This option is disabled because you cannot modify this parcel&apos;s options.
+				這個�項已關閉因為你�能修改這個地段的�項。
 			</panel.string>
 			<panel.string name="mature_check_mature">
 				�度�人內容
@@ -331,35 +331,35 @@ Only large parcels can be listed in search.
 			</text>
 			<check_box label="安全（無傷害）" name="check safe" tool_tip="若勾�則設應土地為安全的，傷害性的戰鬥將被關閉。清除勾�後�能進行傷害性的戰鬥。"/>
 			<check_box label="�止推撞" name="PushRestrictCheck" tool_tip="防止使用腳本推撞。勾�這個�項將�以有效防止你土地上的破壞行為。"/>
-			<check_box label="將地點刊登顯示在�尋中（L$30 / �週）" name="ShowDirectoryCheck" tool_tip="Let people see this parcel in search results"/>
+			<check_box label="將地點刊登顯示在�尋中（L$30 / �週）" name="ShowDirectoryCheck" tool_tip="讓其他人�以在�尋�果中看到這塊地段"/>
 			<combo_box name="land category with adult">
 				<combo_box.item label="任何類別" name="item0"/>
 				<combo_box.item label="Linden Location" name="item1"/>
 				<combo_box.item label="完全�人" name="item2"/>
-				<combo_box.item label="Arts &amp; Culture" name="item3"/>
-				<combo_box.item label="Business" name="item4"/>
-				<combo_box.item label="Educational" name="item5"/>
-				<combo_box.item label="Gaming" name="item6"/>
+				<combo_box.item label="�術與文化" name="item3"/>
+				<combo_box.item label="商業" name="item4"/>
+				<combo_box.item label="教育" name="item5"/>
+				<combo_box.item label="�戲" name="item6"/>
 				<combo_box.item label="�會所" name="item7"/>
-				<combo_box.item label="Newcomer Friendly" name="item8"/>
-				<combo_box.item label="Parks &amp; Nature" name="item9"/>
-				<combo_box.item label="Residential" name="item10"/>
-				<combo_box.item label="Shopping" name="item11"/>
+				<combo_box.item label="新手�善" name="item8"/>
+				<combo_box.item label="公園與自然" name="item9"/>
+				<combo_box.item label="�宅" name="item10"/>
+				<combo_box.item label="採購" name="item11"/>
 				<combo_box.item label="Rental" name="item13"/>
 				<combo_box.item label="Other" name="item12"/>
 			</combo_box>
 			<combo_box name="land category">
 				<combo_box.item label="任何類別" name="item0"/>
 				<combo_box.item label="Linden Location" name="item1"/>
-				<combo_box.item label="Arts &amp; Culture" name="item3"/>
-				<combo_box.item label="Business" name="item4"/>
-				<combo_box.item label="Educational" name="item5"/>
-				<combo_box.item label="Gaming" name="item6"/>
+				<combo_box.item label="�術與文化" name="item3"/>
+				<combo_box.item label="商業" name="item4"/>
+				<combo_box.item label="教育" name="item5"/>
+				<combo_box.item label="�戲" name="item6"/>
 				<combo_box.item label="�會所" name="item7"/>
-				<combo_box.item label="Newcomer Friendly" name="item8"/>
-				<combo_box.item label="Parks &amp; Nature" name="item9"/>
-				<combo_box.item label="Residential" name="item10"/>
-				<combo_box.item label="Shopping" name="item11"/>
+				<combo_box.item label="新手�善" name="item8"/>
+				<combo_box.item label="公園與自然" name="item9"/>
+				<combo_box.item label="�宅" name="item10"/>
+				<combo_box.item label="採購" name="item11"/>
 				<combo_box.item label="Rental" name="item13"/>
 				<combo_box.item label="Other" name="item12"/>
 			</combo_box>
@@ -367,7 +367,7 @@ Only large parcels can be listed in search.
 			<text name="Snapshot:">
 				快照：
 			</text>
-			<texture_picker name="snapshot_ctrl" tool_tip="點擊以挑�圖片"/>
+			<texture_picker name="snapshot_ctrl" tool_tip="點擊以挑�圖�"/>
 			<text name="landing_point">
 				登陸點：[LANDING]
 			</text>
@@ -398,7 +398,7 @@ Only large parcels can be listed in search.
 			<text name="Media texture:">
 				�代�質：
 			</text>
-			<texture_picker name="media texture" tool_tip="點擊以挑�圖片"/>
+			<texture_picker name="media texture" tool_tip="點擊以挑�圖�"/>
 			<text name="replace_texture_help">
 				Objects using this texture will show the movie or web page after you click the play arrow.  Select the thumbnail to choose a different texture.
 			</text>
@@ -412,7 +412,7 @@ Only large parcels can be listed in search.
 				�素
 			</text>
 			<text name="Options:">
-				Options:
+				�項：
 			</text>
 			<check_box label="Loop" name="media_loop" tool_tip="Play media in a loop.  When the media has finished playing, it will restart from the beginning."/>
 		</panel>
@@ -442,14 +442,14 @@ Only large parcels can be listed in search.
 				One or more of these options is set at the estate level
 			</panel.string>
 			<text name="Limit access to this parcel to:">
-				Access To This Parcel
+				出入此地段
 			</text>
 			<text name="Only Allow">
 				Restrict Access to Residents verified by:
 			</text>
 			<check_box label="Payment Information on File [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Ban unidentified Residents."/>
 			<check_box label="年齡驗證 [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Ban Residents who have not verified their age. See the [SUPPORT_SITE] for more information."/>
-			<check_box label="�許出入的群組：[GROUP]" name="GroupCheck" tool_tip="Set group in the General tab."/>
+			<check_box label="�許出入的群組：[GROUP]" name="GroupCheck" tool_tip="設定群組於一般�籤。"/>
 			<check_box label="出售通行權給：" name="PassCheck" tool_tip="�許暫時出入這個地段"/>
 			<combo_box name="pass_combo">
 				<combo_box.item label="Anyone" name="Anyone"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_animation_preview.xml b/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
index baf68ffce6..c5e2eac446 100644
--- a/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
@@ -173,8 +173,8 @@ Maximum animation length is [MAX_LENGTH] seconds.
 	</combo_box>
 	<spinner label="淡入（秒）" name="ease_in_time" tool_tip="Amount of time (in seconds) over which animations blends in"/>
 	<spinner label="淡出（秒）" name="ease_out_time" tool_tip="Amount of time (in seconds) over which animations blends out"/>
-	<button name="play_btn" tool_tip="Play your animation"/>
-	<button name="pause_btn" tool_tip="Pause your animation"/>
+	<button name="play_btn" tool_tip="播放你的動作"/>
+	<button name="pause_btn" tool_tip="暫�你的動�"/>
 	<button name="stop_btn" tool_tip="Stop animation playback"/>
 	<text name="bad_animation_text">
 		Unable to read animation file.
diff --git a/indra/newview/skins/default/xui/zh/floater_build_options.xml b/indra/newview/skins/default/xui/zh/floater_build_options.xml
index 95211b746c..b9d3b6b849 100644
--- a/indra/newview/skins/default/xui/zh/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/zh/floater_build_options.xml
@@ -4,7 +4,7 @@
 	<spinner label="Grid Extents (meters)" name="GridDrawSize"/>
 	<check_box label="貼齊至�單�" name="GridSubUnit"/>
 	<check_box label="View cross-sections" name="GridCrossSection"/>
-	<text name="grid_opacity_label" tool_tip="Grid opacity">
-		Opacity:
+	<text name="grid_opacity_label" tool_tip="格線��明度">
+		��明度：
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_bumps.xml b/indra/newview/skins/default/xui/zh/floater_bumps.xml
index 64c11af953..2d76a9f831 100644
--- a/indra/newview/skins/default/xui/zh/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/zh/floater_bumps.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_bumps" title="BUMPS, PUSHES &amp; HITS">
+<floater name="floater_bumps" title="碰撞�推擠與打擊">
 	<floater.string name="none_detected">
 		未�測到
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_currency.xml b/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
index f187a1ab40..d63e73c6f1 100644
--- a/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
@@ -55,7 +55,7 @@
 		Confirming this purchase only buys L$, not the object.
 	</text>
 	<text name="purchase_warning_notenough">
-		You aren&apos;t buying enough L$. Please increase the amount.
+		你並未購買足夠的林登幣，請先添加一些數�。
 	</text>
 	<button label="立�購買" name="buy_btn"/>
 	<button label="�消" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_land.xml b/indra/newview/skins/default/xui/zh/floater_buy_land.xml
index c4a5d174ef..336d14747d 100644
--- a/indra/newview/skins/default/xui/zh/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_land.xml
@@ -26,10 +26,10 @@ Try selecting a smaller area.
 		You do not have permission to buy land for your active group.
 	</floater.string>
 	<floater.string name="parcel_not_for_sale">
-		The selected parcel is not for sale.
+		所�擇的地段�出售。.
 	</floater.string>
 	<floater.string name="group_already_owns">
-		The group already owns the parcel.
+		這個群組已�有這個地段。
 	</floater.string>
 	<floater.string name="you_already_own">
 		你已經�有這個地段。
@@ -62,7 +62,7 @@ Try selecting a smaller area.
 		Cannot buy now:
 	</floater.string>
 	<floater.string name="not_for_sale">
-		Not for sale:
+		�出售：
 	</floater.string>
 	<floater.string name="none_needed">
 		none needed
diff --git a/indra/newview/skins/default/xui/zh/floater_critical.xml b/indra/newview/skins/default/xui/zh/floater_critical.xml
index da357bde56..7d08fe8af2 100644
--- a/indra/newview/skins/default/xui/zh/floater_critical.xml
+++ b/indra/newview/skins/default/xui/zh/floater_critical.xml
@@ -2,7 +2,7 @@
 <floater name="modal container">
 	<button label="繼續" label_selected="繼續" name="Continue"/>
 	<text name="tos_heading">
-		Please read the following message carefully.
+		請仔細閱讀下列的訊�。
 	</text>
 	<text_editor name="tos_text">
 		TOS_TEXT
diff --git a/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml
index 28d2ba6ed4..84186c5836 100644
--- a/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml
@@ -85,7 +85,7 @@
 			<text name="DayCycleText3">
 				�覽：
 			</text>
-			<button label="Play" label_selected="Play" name="WLAnimSky"/>
+			<button label="播放" label_selected="播放" name="WLAnimSky"/>
 			<button label="�止!" label_selected="�止" name="WLStopAnimSky"/>
 			<button label="Use Estate Time" label_selected="Go to Estate Time" name="WLUseLindenTime"/>
 			<button label="Save Test Day" label_selected="Save Test Day" name="WLSaveDayCycle"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_display_name.xml b/indra/newview/skins/default/xui/zh/floater_display_name.xml
index 39abfe0b8b..01b5088794 100644
--- a/indra/newview/skins/default/xui/zh/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/zh/floater_display_name.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Display Name" title="CHANGE DISPLAY NAME">
+<floater name="Display Name" title="變更顯示�稱">
 	<text name="info_text">
 		The name you give your avatar is called your Display Name. You can change it once a week.
 	</text>
@@ -7,12 +7,12 @@
 		You cannot change your Display Name until: [TIME].
 	</text>
 	<text name="set_name_label">
-		New Display Name:
+		新顯示�稱：
 	</text>
 	<text name="name_confirm_label">
 		Type your new name again to confirm:
 	</text>
-	<button label="儲存" name="save_btn" tool_tip="Save your new Display Name"/>
+	<button label="儲存" name="save_btn" tool_tip="儲存你的新顯示�稱"/>
 	<button label="�設" name="reset_btn" tool_tip="Make Display Name the same as Username"/>
 	<button label="�消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_image_preview.xml b/indra/newview/skins/default/xui/zh/floater_image_preview.xml
index d7e9a7704c..1260601f90 100644
--- a/indra/newview/skins/default/xui/zh/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_image_preview.xml
@@ -12,14 +12,14 @@
 	<combo_box label="��類型" name="clothing_type_combo">
 		<item label="圖�" name="Image" value="圖�"/>
 		<item label="é ­é«®" name="Hair" value="é ­é«®"/>
-		<item label="Female Head" name="FemaleHead" value="Female Head"/>
-		<item label="Female Upper Body" name="FemaleUpperBody" value="Female Upper Body"/>
-		<item label="Female Lower Body" name="FemaleLowerBody" value="Female Lower Body"/>
-		<item label="Male Head" name="MaleHead" value="Male Head"/>
-		<item label="Male Upper Body" name="MaleUpperBody" value="Male Upper Body"/>
-		<item label="Male Lower Body" name="MaleLowerBody" value="Male Lower Body"/>
+		<item label="女性頭部" name="FemaleHead" value="女性頭部"/>
+		<item label="女性上�身" name="FemaleUpperBody" value="女性上�身"/>
+		<item label="女性下�身" name="FemaleLowerBody" value="女性下�身"/>
+		<item label="男性頭部" name="MaleHead" value="男性頭部"/>
+		<item label="男性上�身" name="MaleUpperBody" value="男性上�身"/>
+		<item label="男性下�身" name="MaleLowerBody" value="男性下�身"/>
 		<item label="裙�" name="Skirt" value="裙�"/>
-		<item label="Sculpted Prim" name="SculptedPrim" value="Sculpted Prim"/>
+		<item label="雕刻的幾何元件" name="SculptedPrim" value="雕刻的幾何元件"/>
 	</combo_box>
 	<text name="bad_image_text">
 		無法讀�圖�。
diff --git a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
index 123cdd9f2c..a0f31fa11f 100644
--- a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
@@ -13,10 +13,10 @@
 		通話中。
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
-		has joined a Voice Chat call with a conference chat.
+		已加訴入會議交談中的語音�天。
 	</floater.string>
 	<floater.string name="VoiceInviteGroup">
-		just joined &apos;[GROUP]&apos; voice channel.
+		剛加入 &apos;[GROUP]&apos; 語音頻�。
 	</floater.string>
 	<floater.string name="VoiceInviteQuestionGroup">
 		Would you like to leave [CURRENT_CHAT] and join the call with &apos;[GROUP]&apos;?
diff --git a/indra/newview/skins/default/xui/zh/floater_inspect.xml b/indra/newview/skins/default/xui/zh/floater_inspect.xml
index 295538f797..ea3d9d0c3e 100644
--- a/indra/newview/skins/default/xui/zh/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inspect.xml
@@ -5,9 +5,9 @@
 	</floater.string>
 	<scroll_list name="object_list" tool_tip="Select an object from this list to highlight it in-world">
 		<scroll_list.columns label="物件�稱" name="object_name"/>
-		<scroll_list.columns label="Owner Name" name="owner_name"/>
-		<scroll_list.columns label="Creator Name" name="creator_name"/>
-		<scroll_list.columns label="Creation Date" name="creation_date"/>
+		<scroll_list.columns label="�有者�稱" name="owner_name"/>
+		<scroll_list.columns label="創造者�稱" name="creator_name"/>
+		<scroll_list.columns label="創造日期" name="creation_date"/>
 	</scroll_list>
 	<button label="察看�有者檔案..." name="button owner" tool_tip="See profile of the highlighted object&apos;s owner"/>
 	<button label="察看創造者檔案..." name="button creator" tool_tip="See profile of the highlighted object&apos;s original creator"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
index 370ab32b9f..d698edf5e5 100644
--- a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
@@ -5,7 +5,7 @@
 	<check_box label="��" name="check_clothing"/>
 	<check_box label="姿勢" name="check_gesture"/>
 	<check_box label="地標" name="check_landmark"/>
-	<check_box label="Notecards" name="check_notecard"/>
+	<check_box label="記事�" name="check_notecard"/>
 	<check_box label="Objects" name="check_object"/>
 	<check_box label="腳本" name="check_script"/>
 	<check_box label="Sounds" name="check_sound"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml b/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
index 8b15668e3b..63da47f4de 100644
--- a/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
@@ -4,10 +4,10 @@
 		5
 	</floater.string>
 	<floater.string name="localchat">
-		Nearby Voice Chat
+		附近的語音�天
 	</floater.string>
 	<floater.string name="anonymous">
-		anonymous
+		匿�
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
 		通話中。
@@ -22,7 +22,7 @@
 		Calling [CALLEE_NAME]
 	</text>
 	<text name="noanswer">
-		No Answer.  Please try again later.
+		無應答，請�候�試。
 	</text>
 	<text name="nearby">
 		You have been disconnected from [VOICE_CHANNEL_NAME].  [RECONNECT_NEARBY]
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_animation.xml b/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
index ead8dc49a6..c435ddc0bd 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
@@ -6,6 +6,6 @@
 	<text name="desc txt">
 		�述：
 	</text>
-	<button label="Play Inworld" label_selected="�止" name="Anim play btn" tool_tip="Play this animation so that others can see it"/>
-	<button label="Play Locally" label_selected="�止" name="Anim audition btn" tool_tip="Play this animation so that only you can see it"/>
+	<button label="播放於虛擬世界" label_selected="�止" name="Anim play btn" tool_tip="Play this animation so that others can see it"/>
+	<button label="播放於本地" label_selected="�止" name="Anim audition btn" tool_tip="Play this animation so that only you can see it"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_sound.xml b/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
index d99d13669f..46844349de 100644
--- a/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
@@ -6,6 +6,6 @@
 	<text name="desc txt">
 		�述：
 	</text>
-	<button label="Play Inworld" label_selected="Play Inworld" name="Sound play btn" tool_tip="Play this sound so that others can hear it"/>
-	<button label="Play Locally" label_selected="Play Locally" name="Sound audition btn" tool_tip="Play this sound so that only you can hear it"/>
+	<button label="播放於虛擬世界" label_selected="播放於虛擬世界" name="Sound play btn" tool_tip="Play this sound so that others can hear it"/>
+	<button label="播放於本地" label_selected="播放於本地" name="Sound audition btn" tool_tip="Play this sound so that only you can hear it"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
index fc00b0b4a2..01586ac153 100644
--- a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="PICK: TEXTURE">
 	<floater.string name="choose_picture">
-		點擊以挑�圖片
+		點擊以挑�圖�
 	</floater.string>
 	<floater.string name="pick title">
 		Pick:
diff --git a/indra/newview/skins/default/xui/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml
index c70e70451e..2db98eb3d7 100644
--- a/indra/newview/skins/default/xui/zh/floater_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tools.xml
@@ -48,7 +48,7 @@
 		Drag to move, shift-drag to copy
 	</text>
 	<radio_group name="focus_radio_group">
-		<radio_item label="Zoom" name="radio zoom"/>
+		<radio_item label="縮放" name="radio zoom"/>
 		<radio_item label="環繞（Ctrl）" name="radio orbit"/>
 		<radio_item label="平移（Ctrl+Shift）" name="radio pan"/>
 	</radio_group>
@@ -75,10 +75,10 @@
 	</text>
 	<check_box initial_value="true" label="伸展�質" name="checkbox stretch textures"/>
 	<check_box initial_value="true" label="貼齊格線" name="checkbox snap to grid"/>
-	<combo_box name="combobox grid mode" tool_tip="Choose the type of grid ruler for positioning the object">
-		<combo_box.item label="World grid" name="World"/>
-		<combo_box.item label="Local grid" name="Local"/>
-		<combo_box.item label="Reference grid" name="Reference"/>
+	<combo_box name="combobox grid mode" tool_tip="�擇物件定��考的格線尺度類型">
+		<combo_box.item label="世界格線" name="World"/>
+		<combo_box.item label="地方格線" name="Local"/>
+		<combo_box.item label="�考格線" name="Reference"/>
 	</combo_box>
 	<button name="Options..." tool_tip="察看更多格線�項"/>
 	<button name="ToolCube" tool_tip="Cube"/>
@@ -125,15 +125,15 @@
 		物件： [COUNT]
 	</text>
 	<text name="prim_count">
-		Prims: [COUNT]
+		幾何元件： [COUNT]
 	</text>
 	<tab_container name="Object Info Tabs">
 		<panel label="一般" name="General">
 			<panel.string name="text deed continued">
-				Deed
+				讓渡
 			</panel.string>
 			<panel.string name="text deed">
-				Deed
+				讓渡
 			</panel.string>
 			<panel.string name="text modify info 1">
 				你能修改這個物件
@@ -183,7 +183,7 @@
 			<name_box initial_value="載入中..." name="Group Name Proxy"/>
 			<button name="button set group" tool_tip="�擇一個群組以分享這物件權�"/>
 			<check_box label="分享" name="checkbox share with group" tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."/>
-			<button label="Deed" label_selected="Deed" name="button deed" tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."/>
+			<button label="讓渡" label_selected="讓渡" name="button deed" tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."/>
 			<text name="label click action">
 				點擊以：
 			</text>
@@ -272,7 +272,7 @@
 				<combo_box.item label="Sculpted" name="Sculpted"/>
 			</combo_box>
 			<combo_box name="material">
-				<combo_box.item label="Stone" name="Stone"/>
+				<combo_box.item label="石頭" name="Stone"/>
 				<combo_box.item label="金屬" name="Metal"/>
 				<combo_box.item label="玻璃" name="Glass"/>
 				<combo_box.item label="木頭" name="Wood"/>
@@ -340,7 +340,7 @@
 			<text name="text revolutions">
 				Revolutions
 			</text>
-			<texture_picker label="Sculpt Texture" name="sculpt texture control" tool_tip="點擊以挑�圖片"/>
+			<texture_picker label="Sculpt Texture" name="sculpt texture control" tool_tip="點擊以挑�圖�"/>
 			<check_box label="Mirror" name="sculpt mirror control" tool_tip="Flips sculpted prim along the X axis"/>
 			<check_box label="Inside-out" name="sculpt invert control" tool_tip="Inverts the sculpted prims normals, making it appear inside-out"/>
 			<text name="label sculpt type">
@@ -356,28 +356,28 @@
 		</panel>
 		<panel label="特性" name="Features">
 			<text name="select_single">
-				Select only one primitive to edit features.
+				�能�擇一個幾何元件去編輯細節。
 			</text>
 			<text name="edit_object">
 				編輯物件特性：
 			</text>
-			<check_box label="Flexible Path" name="Flexible1D Checkbox Ctrl" tool_tip="Allows object to flex about the Z axis (Client-side only)"/>
-			<spinner label="Softness" name="FlexNumSections"/>
-			<spinner label="Gravity" name="FlexGravity"/>
-			<spinner label="Drag" name="FlexFriction"/>
-			<spinner label="Wind" name="FlexWind"/>
-			<spinner label="Tension" name="FlexTension"/>
-			<spinner label="Force X" name="FlexForceX"/>
-			<spinner label="Force Y" name="FlexForceY"/>
-			<spinner label="Force Z" name="FlexForceZ"/>
-			<check_box label="Light" name="Light Checkbox Ctrl" tool_tip="Causes object to emit light"/>
+			<check_box label="彈性路徑" name="Flexible1D Checkbox Ctrl" tool_tip="Allows object to flex about the Z axis (Client-side only)"/>
+			<spinner label="柔軟" name="FlexNumSections"/>
+			<spinner label="�力" name="FlexGravity"/>
+			<spinner label="拖曳" name="FlexFriction"/>
+			<spinner label="風力" name="FlexWind"/>
+			<spinner label="張力" name="FlexTension"/>
+			<spinner label="強制 X 軸" name="FlexForceX"/>
+			<spinner label="強制 Y 軸" name="FlexForceY"/>
+			<spinner label="強制 Z 軸" name="FlexForceZ"/>
+			<check_box label="光�" name="Light Checkbox Ctrl" tool_tip="導致物件發光"/>
 			<color_swatch name="colorswatch" tool_tip="點擊以開啟�色挑�器"/>
 			<texture_picker label="" name="light texture control" tool_tip="Click to choose a projection image (only has effect with deferred rendering enabled)"/>
-			<spinner label="Intensity" name="Light Intensity"/>
+			<spinner label="強度" name="Light Intensity"/>
 			<spinner label="FOV" name="Light FOV"/>
-			<spinner label="Radius" name="Light Radius"/>
+			<spinner label="�徑" name="Light Radius"/>
 			<spinner label="Focus" name="Light Focus"/>
-			<spinner label="Falloff" name="Light Falloff"/>
+			<spinner label="衰減" name="Light Falloff"/>
 			<spinner label="Ambiance" name="Light Ambiance"/>
 		</panel>
 		<panel label="�質" name="Texture">
@@ -387,7 +387,7 @@
 			<panel.string name="string repeats per face">
 				�一��覆次數
 			</panel.string>
-			<texture_picker label="�質" name="texture control" tool_tip="點擊以挑�圖片"/>
+			<texture_picker label="�質" name="texture control" tool_tip="點擊以挑�圖�"/>
 			<color_swatch label="�色" name="colorswatch" tool_tip="點擊以開啟�色挑�器"/>
 			<text name="color trans">
 				�明度 %
diff --git a/indra/newview/skins/default/xui/zh/floater_url_entry.xml b/indra/newview/skins/default/xui/zh/floater_url_entry.xml
index 65f6a9cb95..9e3f3cd47d 100644
--- a/indra/newview/skins/default/xui/zh/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/zh/floater_url_entry.xml
@@ -3,7 +3,7 @@
 	<text name="media_label">
 		媒體 URL：
 	</text>
-	<button label="" name="ok_btn"/>
+	<button label="確定" name="ok_btn"/>
 	<button label="�消" name="cancel_btn"/>
 	<button label="清除" name="clear_btn"/>
 	<text name="loading_label">
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
index c27b80e9c5..24b7efea4f 100644
--- a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_controls" title="Voice Controls">
+<floater name="floater_voice_controls" title="語音控制">
 	<string name="title_nearby">
-		NEARBY VOICE
+		附近的語音
 	</string>
 	<string name="title_group">
 		與 [GROUP] 進行群組通話
@@ -13,7 +13,7 @@
 		與 [NAME] 進行通話
 	</string>
 	<string name="no_one_near">
-		No one near has voice enabled
+		附近沒有一人開啟語音
 	</string>
 	<layout_stack name="my_call_stack">
 		<layout_panel name="my_panel">
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory.xml b/indra/newview/skins/default/xui/zh/menu_inventory.xml
index 49a50c97c6..87d769af0d 100644
--- a/indra/newview/skins/default/xui/zh/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory.xml
@@ -2,17 +2,17 @@
 <menu name="Popup">
 	<menu_item_call label="分享" name="Share"/>
 	<menu_item_call label="購買" name="Task Buy"/>
-	<menu_item_call label="Open" name="Task Open"/>
-	<menu_item_call label="Play" name="Task Play"/>
-	<menu_item_call label="Properties" name="Task Properties"/>
+	<menu_item_call label="é–‹å•Ÿ" name="Task Open"/>
+	<menu_item_call label="播放" name="Task Play"/>
+	<menu_item_call label="屬性" name="Task Properties"/>
 	<menu_item_call label="更�" name="Task Rename"/>
 	<menu_item_call label="刪除" name="Task Remove"/>
 	<menu_item_call label="清空垃圾筒" name="Empty Trash"/>
-	<menu_item_call label="Empty Lost And Found" name="Empty Lost And Found"/>
+	<menu_item_call label="清空 Lost And Found" name="Empty Lost And Found"/>
 	<menu_item_call label="新資料夾" name="New Folder"/>
-	<menu_item_call label="New Script" name="New Script"/>
-	<menu_item_call label="New Notecard" name="New Note"/>
-	<menu_item_call label="New Gesture" name="New Gesture"/>
+	<menu_item_call label="新腳本" name="New Script"/>
+	<menu_item_call label="新記事�" name="New Note"/>
+	<menu_item_call label="新姿勢" name="New Gesture"/>
 	<menu label="新衣�" name="New Clothes">
 		<menu_item_call label="新襯衫" name="New Shirt"/>
 		<menu_item_call label="新褲�" name="New Pants"/>
@@ -52,11 +52,11 @@
 	<menu_item_call label="添加到目��扮" name="Add To Outfit"/>
 	<menu_item_call label="由目�的�扮移除" name="Remove From Outfit"/>
 	<menu_item_call label="尋找原件" name="Find Original"/>
-	<menu_item_call label="Purge Item" name="Purge Item"/>
-	<menu_item_call label="Restore Item" name="Restore Item"/>
+	<menu_item_call label="清空物�" name="Purge Item"/>
+	<menu_item_call label="�復物�" name="Restore Item"/>
 	<menu_item_call label="é–‹å•Ÿ" name="Open"/>
-	<menu_item_call label="Open Original" name="Open Original"/>
-	<menu_item_call label="Properties" name="Properties"/>
+	<menu_item_call label="開啟原件" name="Open Original"/>
+	<menu_item_call label="屬性" name="Properties"/>
 	<menu_item_call label="更�" name="Rename"/>
 	<menu_item_call label="覆製資產 UUID" name="Copy Asset UUID"/>
 	<menu_item_call label="覆製" name="Copy"/>
@@ -68,11 +68,11 @@
 	<menu_item_call label="Start Conference Chat" name="Conference Chat Folder"/>
 	<menu_item_call label="播放" name="Sound Play"/>
 	<menu_item_call label="添加地標" name="About Landmark"/>
-	<menu_item_call label="Play Inworld" name="Animation Play"/>
-	<menu_item_call label="Play Locally" name="Animation Audition"/>
+	<menu_item_call label="播放於虛擬世界" name="Animation Play"/>
+	<menu_item_call label="播放於本地" name="Animation Audition"/>
 	<menu_item_call label="�出�時訊�" name="Send Instant Message"/>
 	<menu_item_call label="發給瞬間傳�請求..." name="Offer Teleport..."/>
-	<menu_item_call label="Start Conference Chat" name="Conference Chat"/>
+	<menu_item_call label="開始會議交談" name="Conference Chat"/>
 	<menu_item_call label="Activate" name="Activate"/>
 	<menu_item_call label="Deactivate" name="Deactivate"/>
 	<menu_item_call label="�存" name="Save As"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
index 74b90ada5e..8ad0e7324f 100644
--- a/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
@@ -6,7 +6,7 @@
 	<menu_item_check label="總是由�稱排�資料夾" name="sort_folders_by_name"/>
 	<menu_item_check label="系統資料夾排�到最上方" name="sort_system_folders_to_top"/>
 	<menu_item_call label="顯示�濾器" name="show_filters"/>
-	<menu_item_call label="Reset Filters" name="reset_filters"/>
+	<menu_item_call label="�設�濾器" name="reset_filters"/>
 	<menu_item_call label="關閉全部資料夾" name="close_folders"/>
 	<menu_item_call label="清空 Lost and Found" name="empty_lostnfound"/>
 	<menu_item_call label="儲存�質為" name="Save Texture As"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index a51e26c3f4..f7be781cac 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -139,45 +139,46 @@
 		<menu_item_check label="Disable Camera Constraints" name="Disable Camera Distance"/>
 		<menu_item_check label="高解�度快照" name="HighResSnapshot"/>
 		<menu_item_check label="�音��快照到硬碟" name="QuietSnapshotsToDisk"/>
+		<menu_item_check label="壓縮快照存到硬碟" name="CompressSnapshotsToDisk"/>
 		<menu label="效能工具" name="Performance Tools">
 			<menu_item_call label="Lag Meter" name="Lag Meter"/>
 			<menu_item_check label="統計列" name="Statistics Bar"/>
 			<menu_item_check label="Show Avatar Rendering Cost" name="Avatar Rendering Cost"/>
 		</menu>
-		<menu label="Highlighting and Visibility" name="Highlighting and Visibility">
+		<menu label="高亮顯示與�見度" name="Highlighting and Visibility">
 			<menu_item_check label="Cheesy Beacon" name="Cheesy Beacon"/>
-			<menu_item_check label="Hide Particles" name="Hide Particles"/>
-			<menu_item_check label="Hide Selected" name="Hide Selected"/>
+			<menu_item_check label="隱�粒�效果" name="Hide Particles"/>
+			<menu_item_check label="隱�所�擇的" name="Hide Selected"/>
 			<menu_item_check label="高亮顯示�明物件" name="Highlight Transparent"/>
 			<menu_item_check label="顯示 HUD 附件" name="Show HUD Attachments"/>
-			<menu_item_check label="Show Mouselook Crosshairs" name="ShowCrosshairs"/>
+			<menu_item_check label="顯示第一人稱視角準星" name="ShowCrosshairs"/>
 		</menu>
 		<menu label="Rendering Types" name="Rendering Types">
-			<menu_item_check label="Simple" name="Simple"/>
+			<menu_item_check label="ç°¡å–®" name="Simple"/>
 			<menu_item_check label="��明" name="Alpha"/>
-			<menu_item_check label="Tree" name="Tree"/>
-			<menu_item_check label="Avatars" name="Character"/>
-			<menu_item_check label="SurfacePath" name="SurfacePath"/>
-			<menu_item_check label="Sky" name="Sky"/>
-			<menu_item_check label="Water" name="Water"/>
-			<menu_item_check label="Ground" name="Ground"/>
-			<menu_item_check label="Volume" name="Volume"/>
-			<menu_item_check label="Grass" name="Grass"/>
-			<menu_item_check label="Clouds" name="Clouds"/>
-			<menu_item_check label="Particles" name="Particles"/>
-			<menu_item_check label="Bump" name="Bump"/>
+			<menu_item_check label="樹木" name="Tree"/>
+			<menu_item_check label="化身" name="Character"/>
+			<menu_item_check label="地表" name="SurfacePath"/>
+			<menu_item_check label="天空" name="Sky"/>
+			<menu_item_check label="æ°´æ–‡" name="Water"/>
+			<menu_item_check label="地�" name="Ground"/>
+			<menu_item_check label="體�" name="Volume"/>
+			<menu_item_check label="�地" name="Grass"/>
+			<menu_item_check label="雲彩" name="Clouds"/>
+			<menu_item_check label="粒�效果" name="Particles"/>
+			<menu_item_check label="碰撞" name="Bump"/>
 		</menu>
 		<menu label="Rendering Features" name="Rendering Features">
 			<menu_item_check label="UI" name="UI"/>
 			<menu_item_check label="Selected" name="Selected"/>
 			<menu_item_check label="Highlighted" name="Highlighted"/>
 			<menu_item_check label="Dynamic Textures" name="Dynamic Textures"/>
-			<menu_item_check label="Foot Shadows" name="Foot Shadows"/>
-			<menu_item_check label="Fog" name="Fog"/>
+			<menu_item_check label="腳步陰影" name="Foot Shadows"/>
+			<menu_item_check label="霧氣" name="Fog"/>
 			<menu_item_check label="Test FRInfo" name="Test FRInfo"/>
-			<menu_item_check label="Flexible Objects" name="Flexible Objects"/>
+			<menu_item_check label="彈性物件" name="Flexible Objects"/>
 		</menu>
-		<menu_item_check label="Use Plugin Read Thread" name="Use Plugin Read Thread"/>
+		<menu_item_check label="使用外�讀�緒" name="Use Plugin Read Thread"/>
 		<menu_item_call label="清除群組快�資料" name="ClearGroupCache"/>
 		<menu_item_check label="滑鼠平滑移動" name="Mouse Smoothing"/>
 		<menu label="快速�" name="Shortcuts">
@@ -213,13 +214,13 @@
 			<menu_item_check label="除錯控制�" name="Debug Console"/>
 			<menu_item_call label="通知控制�" name="Notifications"/>
 			<menu_item_check label="�質尺寸控制�" name="Texture Size"/>
-			<menu_item_check label="Texture Category Console" name="Texture Category"/>
-			<menu_item_check label="Fast Timers" name="Fast Timers"/>
+			<menu_item_check label="�質分類控制�" name="Texture Category"/>
+			<menu_item_check label="快速碼錶" name="Fast Timers"/>
 			<menu_item_check label="記憶體" name="Memory"/>
-			<menu_item_call label="Region Info to Debug Console" name="Region Info to Debug Console"/>
+			<menu_item_call label="地�資訊傳至除錯控制�" name="Region Info to Debug Console"/>
 			<menu_item_call label="群組資訊至除錯控制�" name="Group Info to Debug Console"/>
 			<menu_item_call label="Capabilities Info to Debug Console" name="Capabilities Info to Debug Console"/>
-			<menu_item_check label="Camera" name="Camera"/>
+			<menu_item_check label="�影機" name="Camera"/>
 			<menu_item_check label="風力" name="Wind"/>
 			<menu_item_check label="FOV" name="FOV"/>
 			<menu_item_check label="Badge" name="Badge"/>
@@ -244,7 +245,7 @@
 			<menu_item_call label="模擬記憶體�足" name="Memory Leaking Simulation"/>
 		</menu>
 		<menu label="Render Tests" name="Render Tests">
-			<menu_item_check label="Camera Offset" name="Camera Offset"/>
+			<menu_item_check label="�影機�移" name="Camera Offset"/>
 			<menu_item_check label="Randomize Framerate" name="Randomize Framerate"/>
 			<menu_item_check label="Periodic Slow Frame" name="Periodic Slow Frame"/>
 			<menu_item_check label="Frame Test" name="Frame Test"/>
@@ -275,12 +276,12 @@
 			<menu_item_check label="Shadows from Sun/Moon/Projectors" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO and Shadow Smoothing" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Global Illumination (experimental)" name="Global Illumination"/>
-			<menu_item_check label="Debug GL" name="Debug GL"/>
-			<menu_item_check label="Debug Pipeline" name="Debug Pipeline"/>
+			<menu_item_check label="GL 除錯" name="Debug GL"/>
+			<menu_item_check label="管線除錯" name="Debug Pipeline"/>
 			<menu_item_check label="自動��明�罩（�延）" name="Automatic Alpha Masks (deferred)"/>
 			<menu_item_check label="自動��明�罩（��延）" name="Automatic Alpha Masks (non-deferred)"/>
 			<menu_item_check label="Animation Textures" name="Animation Textures"/>
-			<menu_item_check label="Disable Textures" name="Disable Textures"/>
+			<menu_item_check label="關閉�質" name="Disable Textures"/>
 			<menu_item_check label="Full Res Textures" name="Rull Res Textures"/>
 			<menu_item_check label="Audit Textures" name="Audit Textures"/>
 			<menu_item_check label="Texture Atlas (experimental)" name="Texture Atlas"/>
@@ -297,30 +298,30 @@
 			<menu_item_call label="Drop a Packet" name="Drop a Packet"/>
 		</menu>
 		<menu_item_call label="Dump Scripted Camera" name="Dump Scripted Camera"/>
-		<menu_item_call label="Bumps, Pushes &amp; Hits" name="Bumps, Pushes &amp;amp; Hits"/>
-		<menu label="Recorder" name="Recorder">
-			<menu_item_call label="Start Playback" name="Start Playback"/>
-			<menu_item_call label="Stop Playback" name="Stop Playback"/>
-			<menu_item_check label="Loop Playback" name="Loop Playback"/>
-			<menu_item_call label="Start Record" name="Start Record"/>
-			<menu_item_call label="Stop Record" name="Stop Record"/>
-		</menu>
-		<menu label="World" name="World">
-			<menu_item_check label="Sim Sun Override" name="Sim Sun Override"/>
+		<menu_item_call label="碰撞�推擠與打擊" name="Bumps, Pushes &amp;amp; Hits"/>
+		<menu label="錄製器" name="Recorder">
+			<menu_item_call label="開始播放" name="Start Playback"/>
+			<menu_item_call label="�止播放" name="Stop Playback"/>
+			<menu_item_check label="循環播放" name="Loop Playback"/>
+			<menu_item_call label="開始錄製" name="Start Record"/>
+			<menu_item_call label="�止錄製" name="Stop Record"/>
+		</menu>
+		<menu label="世界" name="World">
+			<menu_item_check label="模擬器太陽設定覆蓋" name="Sim Sun Override"/>
 			<menu_item_check label="Cheesy Beacon" name="Cheesy Beacon"/>
-			<menu_item_check label="Fixed Weather" name="Fixed Weather"/>
+			<menu_item_check label="固定天氣" name="Fixed Weather"/>
 			<menu_item_call label="傾�地�物件快�" name="Dump Region Object Cache"/>
 		</menu>
 		<menu label="UI" name="UI">
-			<menu_item_call label="Media Browser Test" name="Web Browser Test"/>
-			<menu_item_call label="Web Content Browser" name="Web Content Browser"/>
+			<menu_item_call label="測試媒體�覽器" name="Web Browser Test"/>
+			<menu_item_call label="網�內容�覽器" name="Web Content Browser"/>
 			<menu_item_call label="Dump SelectMgr" name="Dump SelectMgr"/>
 			<menu_item_call label="傾�收��" name="Dump Inventory"/>
-			<menu_item_call label="Dump Timers" name="Dump Timers"/>
+			<menu_item_call label="傾�碼錶" name="Dump Timers"/>
 			<menu_item_call label="Dump Focus Holder" name="Dump Focus Holder"/>
 			<menu_item_call label="Print Selected Object Info" name="Print Selected Object Info"/>
 			<menu_item_call label="Print Agent Info" name="Print Agent Info"/>
-			<menu_item_call label="Memory Stats" name="Memory Stats"/>
+			<menu_item_call label="計憶體狀態" name="Memory Stats"/>
 			<menu_item_check label="Region Debug Console" name="Region Debug Console"/>
 			<menu_item_check label="Debug SelectMgr" name="Debug SelectMgr"/>
 			<menu_item_check label="Debug Clicks" name="Debug Clicks"/>
@@ -331,9 +332,9 @@
 			<menu_item_check label="Debug WindowProc" name="Debug WindowProc"/>
 		</menu>
 		<menu label="XUI" name="XUI">
-			<menu_item_call label="Reload Color Settings" name="Reload Color Settings"/>
-			<menu_item_call label="Show Font Test" name="Show Font Test"/>
-			<menu_item_check label="Show XUI Names" name="Show XUI Names"/>
+			<menu_item_call label="�新載入�色設定" name="Reload Color Settings"/>
+			<menu_item_call label="顯示字型測試" name="Show Font Test"/>
+			<menu_item_check label="顯示 XUI �稱" name="Show XUI Names"/>
 			<menu_item_call label="�出測試 IMs" name="Send Test IMs"/>
 			<menu_item_call label="沖洗�稱快�資料" name="Flush Names Caches"/>
 		</menu>
@@ -348,12 +349,12 @@
 			<menu label="Character Tests" name="Character Tests">
 				<menu_item_call label="Appearance To XML" name="Appearance To XML"/>
 				<menu_item_call label="Toggle Character Geometry" name="Toggle Character Geometry"/>
-				<menu_item_call label="Test Male" name="Test Male"/>
-				<menu_item_call label="Test Female" name="Test Female"/>
-				<menu_item_call label="Toggle PG" name="Toggle PG"/>
-				<menu_item_check label="Allow Select Avatar" name="Allow Select Avatar"/>
+				<menu_item_call label="男性測試" name="Test Male"/>
+				<menu_item_call label="女性測試" name="Test Female"/>
+				<menu_item_call label="PG　切�" name="Toggle PG"/>
+				<menu_item_check label="�許�擇化身" name="Allow Select Avatar"/>
 			</menu>
-			<menu_item_call label="Force Params to Default" name="Force Params to Default"/>
+			<menu_item_call label="強制�數為�設值" name="Force Params to Default"/>
 			<menu_item_check label="動作資訊" name="Animation Info"/>
 			<menu_item_check label="慢動作" name="Slow Motion Animations"/>
 			<menu_item_check label="顯示注視在" name="Show Look At"/>
diff --git a/indra/newview/skins/default/xui/zh/mime_types.xml b/indra/newview/skins/default/xui/zh/mime_types.xml
index 89fe92fabc..8ac1bf6920 100644
--- a/indra/newview/skins/default/xui/zh/mime_types.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types.xml
@@ -27,10 +27,10 @@
 			圖�
 		</label>
 		<tooltip name="image_tooltip">
-			There is an image at this location
+			有一個圖�在此�置
 		</tooltip>
 		<playtip name="image_playtip">
-			View this location&apos;s image
+			察看這個�置的圖�
 		</playtip>
 	</widgetset>
 	<widgetset name="audio">
@@ -38,10 +38,10 @@
 			音頻
 		</label>
 		<tooltip name="audio_tooltip">
-			There is audio at this location
+			有一個音頻在此�置
 		</tooltip>
 		<playtip name="audio_playtip">
-			Play this location&apos;s audio
+			播放這個硾的音頻
 		</playtip>
 	</widgetset>
 	<scheme name="rtsp">
diff --git a/indra/newview/skins/default/xui/zh/mime_types_linux.xml b/indra/newview/skins/default/xui/zh/mime_types_linux.xml
index 08839abe6a..90f17b841c 100644
--- a/indra/newview/skins/default/xui/zh/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types_linux.xml
@@ -30,7 +30,7 @@
 			There is an image at this location
 		</tooltip>
 		<playtip name="image_playtip">
-			View this location&apos;s image
+			察看這個�置的圖�
 		</playtip>
 	</widgetset>
 	<widgetset name="audio">
@@ -38,10 +38,10 @@
 			音頻
 		</label>
 		<tooltip name="audio_tooltip">
-			There is audio at this location
+			有一個音頻在此�置
 		</tooltip>
 		<playtip name="audio_playtip">
-			Play this location&apos;s audio
+			播放這個�置的音頻
 		</playtip>
 	</widgetset>
 	<scheme name="rtsp">
@@ -66,7 +66,7 @@
 	</mimetype>
 	<mimetype name="video/*">
 		<label name="video2_label">
-			Video
+			影片
 		</label>
 	</mimetype>
 	<mimetype name="image/*">
diff --git a/indra/newview/skins/default/xui/zh/mime_types_mac.xml b/indra/newview/skins/default/xui/zh/mime_types_mac.xml
index 7958f64219..b8105c145c 100644
--- a/indra/newview/skins/default/xui/zh/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types_mac.xml
@@ -27,10 +27,10 @@
 			圖�
 		</label>
 		<tooltip name="image_tooltip">
-			有一個影�在此�置
+			有一個圖�在此�置
 		</tooltip>
 		<playtip name="image_playtip">
-			察看在此�置的影�
+			察看在此�置的圖�
 		</playtip>
 	</widgetset>
 	<widgetset name="audio">
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 1c89e9b522..2d309a2af0 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -758,16 +758,16 @@ No parcel selected.
 No region selected.
 	</notification>
 	<notification name="CannotReleaseLandNothingSelected">
-		Unable to abandon land:
-No parcel selected.
+		無法放棄土地：
+無地段被�擇。
 	</notification>
 	<notification name="CannotReleaseLandNoRegion">
 		無法放棄土地：
 無法尋找地�。
 	</notification>
 	<notification name="CannotBuyLandNothingSelected">
-		Unable to buy land:
-No parcel selected.
+		無法購買土地：
+無地段被�擇。
 	</notification>
 	<notification name="CannotBuyLandNoRegion">
 		Unable to buy land:
@@ -777,121 +777,121 @@ Cannot find the region this land is in.
 		You cannot close the Buy Land window until [APP_NAME] estimates the price of this transaction.
 	</notification>
 	<notification name="CannotDeedLandNothingSelected">
-		Unable to deed land:
+		無法讓渡土地：
 無地段被��。
 	</notification>
 	<notification name="CannotDeedLandNoGroup">
-		Unable to deed land:
+		無法讓渡土地：
 無群組被��。
 	</notification>
 	<notification name="CannotDeedLandNoRegion">
-		Unable to deed land:
-Cannot find the region this land is in.
+		無法讓渡土地：
+無法發�這塊土地所在的地�。
 	</notification>
 	<notification name="CannotDeedLandMultipleSelected">
-		Unable to deed land:
-Multiple parcels selected.
+		無法讓渡土地：
+複數地段被��。
 
-Try selecting a single parcel.
+請試著��單一地段。
 	</notification>
 	<notification name="CannotDeedLandWaitingForServer">
-		Unable to deed land:
-Waiting for server to report ownership.
+		無法讓渡土地：
+等候伺�器報告�有權。
 
-Please try again.
+請�試一次。
 	</notification>
 	<notification name="CannotDeedLandNoTransfer">
-		Unable to deed land:
-The region [REGION] does not allow transfer of land.
+		無法讓渡土地：
+此 [REGION] 地�並��許土地轉移。
 	</notification>
 	<notification name="CannotReleaseLandWatingForServer">
-		Unable to abandon land:
-Waiting for server to update parcel information.
+		無法放棄土地：
+等候伺�器更新地段資訊。
 
-Try again in a few seconds.
+請�後幾秒�試一次。
 	</notification>
 	<notification name="CannotReleaseLandSelected">
-		Unable to abandon land:
-You do not own all the parcels selected.
+		無法放棄土地：
+你並��有所�擇的全部土地。
 
-Please select a single parcel.
+請�擇一個單一地段。
 	</notification>
 	<notification name="CannotReleaseLandDontOwn">
-		Unable to abandon land:
-You don&apos;t have permission to release this parcel.
-Parcels you own appear in green.
+		無法放棄土地：
+你並沒有權�去釋出這個地段。
+你所�有的地段將呈�綠色。
 	</notification>
 	<notification name="CannotReleaseLandRegionNotFound">
-		Unable to abandon land:
-Cannot find the region this land is in.
+		無法放棄土地：
+無法發�這快土地所在的地�。
 	</notification>
 	<notification name="CannotReleaseLandNoTransfer">
-		Unable to abandon land:
-The region [REGION] does not allow transfer of land.
+		無法放棄土地：
+此 [REGION] 地�並�許土地轉移。
 	</notification>
 	<notification name="CannotReleaseLandPartialSelection">
-		Unable to abandon land:
-You must select an entire parcel to release it.
+		無法放棄土地：
+你必須��一整個地段以釋出它。
 
-Select an entire parcel, or divide your parcel first.
+��一整個地段，或先進行分割。
 	</notification>
 	<notification name="ReleaseLandWarning">
-		You are about to release [AREA] m² of land.
-Releasing this parcel will remove it from your land holdings, but will not grant any L$.
+		你釋出約 [AREA] m² ��土地。
+釋出個地段將會由你所�有的土地中移除，但�會給予任何 L$。
 
-Release this land?
+你確定�釋出這塊土地？
 		<usetemplate name="okcancelbuttons" notext="�消" yestext="確定"/>
 	</notification>
 	<notification name="CannotDivideLandNothingSelected">
-		Unable to divide land:
+		無法分割土地：
 
-No parcels selected.
+無地段被��。
 	</notification>
 	<notification name="CannotDivideLandPartialSelection">
-		Unable to divide land:
+		無法分割土地：
 
-You have an entire parcel selected.
-Try selecting a part of the parcel.
+你�在��整個地段。
+請試著��其中部分地段。
 	</notification>
 	<notification name="LandDivideWarning">
-		Dividing this land will split this parcel into two and each parcel can have its own settings. Some settings will be reset to defaults after the operation.
+		分割土地會將佌地段一分為二，�一個地段將都�自有其設定。 在這個�作之後，一些設定值將會回復到�設值。
 
-Divide land?
+進行分割土地？
 		<usetemplate name="okcancelbuttons" notext="�消" yestext="確定"/>
 	</notification>
 	<notification name="CannotDivideLandNoRegion">
-		Unable to divide land:
-Cannot find the region this land is in.
+		無法分割土地：
+無法發�這塊土地所在的地�。
 	</notification>
 	<notification name="CannotJoinLandNoRegion">
-		Unable to join land:
-Cannot find the region this land is in.
+		無法�併土地：
+無法發�這塊土地所在的地�。
 	</notification>
 	<notification name="CannotJoinLandNothingSelected">
-		Unable to join land:
-No parcels selected.
+		無法�併土地：
+無地段被��。
 	</notification>
 	<notification name="CannotJoinLandEntireParcelSelected">
-		Unable to join land:
-You only have one parcel selected.
+		無法�併土地：
+你�有��一個地段。
 
-Select land across both parcels.
+請跨越兩個地段��土地。
 	</notification>
 	<notification name="CannotJoinLandSelection">
-		Unable to join land:
-You must select more than one parcel.
+		無法�併土地：
+你必須��超�一個地段。
 
-Select land across both parcels.
+請跨越兩個地段��土地。
 	</notification>
 	<notification name="JoinLandWarning">
-		Joining this land will create one large parcel out of all parcels intersecting the selected rectangle.
-You will need to reset the name and options of the new parcel.
+		�併土地將會在��的全部地段範�裡產生一個巨大的地段。
+你將會需��設這個新地段的�稱與設定�項。
 
-Join land?
+進行土地�併？
 		<usetemplate name="okcancelbuttons" notext="�消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmNotecardSave">
-		This notecard needs to be saved before the item can be copied or viewed. Save notecard?
+		在物�能被覆製或察看�，這記事�必須先進行儲存。儲存記事�？
 		<usetemplate name="okcancelbuttons" notext="�消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmItemCopy">
@@ -1377,7 +1377,7 @@ We must restart [APP_NAME] to install the update.
 	<notification name="DeedObjectToGroup">
 		Deeding this object will cause the group to:
 * Receive L$ paid into the object
-		<usetemplate ignoretext="在我讓渡一個物件給群組�確�" name="okcancelignore" notext="�消" yestext="Deed"/>
+		<usetemplate ignoretext="在我讓渡一個物件給群組�確�" name="okcancelignore" notext="�消" yestext="讓渡"/>
 	</notification>
 	<notification name="WebLaunchExternalTarget">
 		你確定�開啟網��覽器去察看這個內容？
@@ -1457,7 +1457,7 @@ Chat and instant messages will be hidden. Instant messages will get your Busy mo
 	<notification name="JoinedTooManyGroupsMember">
 		You have reached your maximum number of groups. Please leave another group before joining this one, or decline the offer.
 [NAME] has invited you to join a group as a member.
-		<usetemplate name="okcancelbuttons" notext="Decline" yestext="加入"/>
+		<usetemplate name="okcancelbuttons" notext="�絕" yestext="加入"/>
 	</notification>
 	<notification name="JoinedTooManyGroups">
 		You have reached your maximum number of groups. Please leave some group before joining or creating a new one.
@@ -1509,12 +1509,12 @@ Chat and instant messages will be hidden. Instant messages will get your Busy mo
 Just like in real life, it takes a while for everyone to learn about a new name.  Please allow several days for [http://wiki.secondlife.com/wiki/Setting_your_display_name your name to update] in objects, scripts, search, etc.
 	</notification>
 	<notification name="SetDisplayNameBlocked">
-		Sorry, you cannot change your display name. If you feel this is in error, please contact support.
+		抱歉，你��以變更你的顯示�稱。如果你覺得這是錯誤，請連繫支�廠商。
 	</notification>
 	<notification name="SetDisplayNameFailedLength">
-		Sorry, that name is too long.  Display names can have a maximum of [LENGTH] characters.
+		抱歉，這�稱太長。顯示�稱最大長度為 [LENGTH] 字元。
 
-Please try a shorter name.
+請嘗試短一些的�稱。
 	</notification>
 	<notification name="SetDisplayNameFailedGeneric">
 		Sorry, we could not set your display name.  Please try again later.
@@ -1890,7 +1890,7 @@ Move the inventory item(s)?
 	</notification>
 	<notification name="ConfirmQuit">
 		你確定你���退出？
-		<usetemplate ignoretext="當我��退出時進行確�" name="okcancelignore" notext="���退出" yestext="��退出"/>
+		<usetemplate ignoretext="當我��退出時進行確�" name="okcancelignore" notext="����退出" yestext="��退出"/>
 	</notification>
 	<notification name="DeleteItems">
 		[QUESTION]
@@ -1941,11 +1941,11 @@ Linden Lab
 		The following required components are missing from [FLOATER]:
 [COMPONENTS]
 	</notification>
-	<notification label="Replace Existing Attachment" name="ReplaceAttachment">
+	<notification label="�代�有的附件" name="ReplaceAttachment">
 		There is already an object attached to this point on your body.
 Do you want to replace it with the selected object?
 		<form name="form">
-			<ignore name="ignore" text="Replace an existing attachment with the selected item"/>
+			<ignore name="ignore" text="以所�擇的物��代�有的附加物"/>
 			<button ignore="自動�代" name="Yes" text="確定"/>
 			<button ignore="絕��代" name="No" text="�消"/>
 		</form>
@@ -2109,10 +2109,10 @@ Link to this from a web page to give others easy access to this location, or try
 		Topic: [SUBJECT], Message: [MESSAGE]
 	</notification>
 	<notification name="FriendOnline">
-		[NAME] is Online
+		[NAME] 上線
 	</notification>
 	<notification name="FriendOffline">
-		[NAME] is Offline
+		[NAME] 離線
 	</notification>
 	<notification name="AddSelfFriend">
 		Although you&apos;re very nice, you can&apos;t add yourself as a friend.
@@ -2208,7 +2208,7 @@ Please select a single object.
 		[NAME] 接收到你�供的收��物�。
 	</notification>
 	<notification name="InventoryDeclined">
-		[NAME] 拒絕你�供的收��物�。
+		[NAME] �絕你�供的收��物�。
 	</notification>
 	<notification name="ObjectMessage">
 		[NAME]: [MESSAGE]
@@ -2418,7 +2418,7 @@ Please try again in a few moments.
 	</notification>
 	<notification name="ObjectGiveItem">
 		An object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; owned by [NAME_SLURL] has given you this [OBJECTTYPE]:
-&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
+[ITEM_SLURL]
 		<form name="form">
 			<button name="Keep" text="Keep"/>
 			<button name="Discard" text="Discard"/>
@@ -2443,7 +2443,7 @@ Please try again in a few moments.
 		[MESSAGE]
 		<form name="form">
 			<button name="Join" text="加入"/>
-			<button name="Decline" text="Decline"/>
+			<button name="Decline" text="�絕"/>
 			<button name="Info" text="資訊"/>
 		</form>
 	</notification>
@@ -2475,7 +2475,7 @@ Please try again in a few moments.
 (By default, you will be able to see each other&apos;s online status.)
 		<form name="form">
 			<button name="Accept" text="接�"/>
-			<button name="Decline" text="Decline"/>
+			<button name="Decline" text="�絕"/>
 		</form>
 	</notification>
 	<notification name="FriendshipOffered">
@@ -2487,27 +2487,27 @@ Please try again in a few moments.
 (By default, you will be able to see each other&apos;s online status.)
 		<form name="form">
 			<button name="Accept" text="接�"/>
-			<button name="Decline" text="Decline"/>
+			<button name="Decline" text="�絕"/>
 		</form>
 	</notification>
 	<notification name="FriendshipAccepted">
 		[NAME] accepted your friendship offer.
 	</notification>
 	<notification name="FriendshipDeclined">
-		[NAME] declined your friendship offer.
+		[NAME] �絕你的交�邀請。
 	</notification>
 	<notification name="FriendshipAcceptedByMe">
-		Friendship offer accepted.
+		交�邀請被接�。
 	</notification>
 	<notification name="FriendshipDeclinedByMe">
-		Friendship offer declined.
+		交�邀請被�絕。
 	</notification>
 	<notification name="OfferCallingCard">
 		[NAME] is offering their calling card.
 This will add a bookmark in your inventory so you can quickly IM this Resident.
 		<form name="form">
 			<button name="Accept" text="接�"/>
-			<button name="Decline" text="Decline"/>
+			<button name="Decline" text="�絕"/>
 		</form>
 	</notification>
 	<notification name="RegionRestartMinutes">
@@ -2559,7 +2559,7 @@ Grant this request?
 		<form name="form">
 			<button name="Grant" text="Grant"/>
 			<button name="Deny" text="Deny"/>
-			<button name="Details" text="Details..."/>
+			<button name="Details" text="細節..."/>
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
@@ -2602,7 +2602,7 @@ Things you build here will be deleted after you leave, so don&apos;t forget to r
 Click Accept to join the call or Decline to decline the invitation. Click Block to block this caller.
 		<form name="form">
 			<button name="Accept" text="接�"/>
-			<button name="Decline" text="Decline"/>
+			<button name="Decline" text="�絕"/>
 			<button name="Mute" text="Block"/>
 		</form>
 	</notification>
@@ -2620,7 +2620,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Block
 Click Accept to join the call or Decline to decline the invitation. Click Block to block this caller.
 		<form name="form">
 			<button name="Accept" text="接�"/>
-			<button name="Decline" text="Decline"/>
+			<button name="Decline" text="�絕"/>
 			<button name="Mute" text="Block"/>
 		</form>
 	</notification>
@@ -2629,7 +2629,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Block
 Click Accept to join the call or Decline to decline the invitation. Click Block to block this caller.
 		<form name="form">
 			<button name="Accept" text="接�"/>
-			<button name="Decline" text="Decline"/>
+			<button name="Decline" text="�絕"/>
 			<button name="Mute" text="Block"/>
 		</form>
 	</notification>
@@ -2638,7 +2638,7 @@ Click Accept to join the call or Decline to decline the invitation. Click Block
 Click Accept to join the chat or Decline to decline the invitation. Click Block to block this caller.
 		<form name="form">
 			<button name="Accept" text="接�"/>
-			<button name="Decline" text="Decline"/>
+			<button name="Decline" text="�絕"/>
 			<button name="Mute" text="Block"/>
 		</form>
 	</notification>
@@ -2757,10 +2757,10 @@ With the following Residents:
 		<usetemplate name="okcancelbuttons" notext="�消" yestext="確定"/>
 	</notification>
 	<notification name="ItemsShared">
-		Items successfully shared.
+		物�已�功分享。
 	</notification>
 	<notification name="DeedToGroupFail">
-		Deed to group failed.
+		讓渡給群組失敗。
 	</notification>
 	<notification name="AvatarRezNotification">
 		( [EXISTENCE] seconds alive )
@@ -2822,7 +2822,7 @@ You uploaded a [RESOLUTION] baked texture for &apos;[BODYREGION]&apos; after [TI
 You locally updated a [RESOLUTION] baked texture for &apos;[BODYREGION]&apos; after [TIME] seconds.
 	</notification>
 	<notification name="ConfirmLeaveCall">
-		Are you sure you want to leave this call?
+		你確定�離開這段通話？
 		<usetemplate ignoretext="我��通話�進行確�" name="okcancelignore" notext="�" yestext="是"/>
 	</notification>
 	<notification name="ConfirmMuteAll">
@@ -2846,7 +2846,7 @@ Click on the up arrow to see the voice control panel.
 
 Hiding the Speak button will disable the voice feature.
 	</notification>
-	<notification label="Explore the World" name="HintDestinationGuide">
+	<notification label="探索世界" name="HintDestinationGuide">
 		The Destination Guide contains thousands of new places to discover. Select a location and choose Teleport to start exploring.
 	</notification>
 	<notification label="�邊欄" name="HintSidePanel">
@@ -2862,7 +2862,7 @@ Click anywhere on the ground to walk to that spot.
 2. Click and Drag to Rotate View
 Click and drag anywhere on the world to rotate your view
 	</notification>
-	<notification label="Display Name" name="HintDisplayName">
+	<notification label="顯示�稱" name="HintDisplayName">
 		Set your customizable display name here. This is in addition to your unique username, which can&apos;t be changed. You can change how you see other people&apos;s names in your preferences.
 	</notification>
 	<notification label="View" name="HintView">
@@ -2871,7 +2871,7 @@ Click and drag anywhere on the world to rotate your view
 	<notification label="收��" name="HintInventory">
 		Check your inventory to find items. Newest items can be easily found in the Recent tab.
 	</notification>
-	<notification label="You&apos;ve got Linden Dollars!" name="HintLindenDollar">
+	<notification label="你得到林登幣!" name="HintLindenDollar">
 		Here&apos;s your current balance of L$. Click Buy L$ to purchase more Linden Dollars.
 	</notification>
 	<notification name="PopupAttempt">
@@ -2892,38 +2892,38 @@ Click and drag anywhere on the world to rotate your view
 	</notification>
 	<notification label="" name="ModeChange">
 		改變劉覽器模��求你必須��退出並�新啟動。
-		<usetemplate name="okcancelbuttons" notext="���退出" yestext="��退出"/>
+		<usetemplate name="okcancelbuttons" notext="����退出" yestext="��退出"/>
 	</notification>
 	<notification label="" name="NoClassifieds">
 		Creation and editing of Classifieds is only available in Advanced mode. Would you like to quit and change modes? The mode selector can be found on the login screen.
-		<usetemplate name="okcancelbuttons" notext="���退出" yestext="��退出"/>
+		<usetemplate name="okcancelbuttons" notext="����退出" yestext="��退出"/>
 	</notification>
 	<notification label="" name="NoGroupInfo">
 		Creation and editing of Groups is only available in Advanced mode. Would you like to quit and change modes? The mode selector can be found on the login screen.
-		<usetemplate name="okcancelbuttons" notext="���退出" yestext="��退出"/>
+		<usetemplate name="okcancelbuttons" notext="����退出" yestext="��退出"/>
 	</notification>
 	<notification label="" name="NoPicks">
 		Creation and editing of Picks is only available in Advanced mode. Would you like to quit and change modes? The mode selector can be found on the login screen.
-		<usetemplate name="okcancelbuttons" notext="���退出" yestext="��退出"/>
+		<usetemplate name="okcancelbuttons" notext="����退出" yestext="��退出"/>
 	</notification>
 	<notification label="" name="NoWorldMap">
 		Viewing of the world map is only available in Advanced mode. Would you like to quit and change modes? The mode selector can be found on the login screen.
-		<usetemplate name="okcancelbuttons" notext="���退出" yestext="��退出"/>
+		<usetemplate name="okcancelbuttons" notext="����退出" yestext="��退出"/>
 	</notification>
 	<notification label="" name="NoVoiceCall">
 		Voice calls are only available in Advanced mode. Would you like to logout and change modes?
-		<usetemplate name="okcancelbuttons" notext="���退出" yestext="��退出"/>
+		<usetemplate name="okcancelbuttons" notext="����退出" yestext="��退出"/>
 	</notification>
 	<notification label="" name="NoAvatarShare">
 		Sharing is only available in Advanced mode. Would you like to logout and change modes?
-		<usetemplate name="okcancelbuttons" notext="���退出" yestext="��退出"/>
+		<usetemplate name="okcancelbuttons" notext="����退出" yestext="��退出"/>
 	</notification>
 	<notification label="" name="NoAvatarPay">
 		Paying other residents is only available in Advanced mode. Would you like to logout and change modes?
-		<usetemplate name="okcancelbuttons" notext="���退出" yestext="��退出"/>
+		<usetemplate name="okcancelbuttons" notext="����退出" yestext="��退出"/>
 	</notification>
 	<global name="UnsupportedCPU">
-		- Your CPU speed does not meet the minimum requirements.
+		- 你的 CPU �算速度未�到系統最低�備�求。
 	</global>
 	<global name="UnsupportedGLRequirements">
 		You do not appear to have the proper hardware requirements for [APP_NAME]. [APP_NAME] requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system.
@@ -2940,7 +2940,7 @@ If you continue to have problems, please visit the [SUPPORT_SITE].
 		- 你的顯示�未�系統最低�備�求。
 	</global>
 	<global name="UnsupportedRAM">
-		- Your system memory does not meet the minimum requirements.
+		- 你的系統記憶體�未�系統最低�備�求。
 	</global>
 	<global name="You can only set your &apos;Home Location&apos; on your land or at a mainland Infohub.">
 		若你�有一塊土地，你�以標記它�為你的家的�置。
diff --git a/indra/newview/skins/default/xui/zh/panel_bottomtray.xml b/indra/newview/skins/default/xui/zh/panel_bottomtray.xml
index 2b0cd7c0a6..734b83e6cc 100644
--- a/indra/newview/skins/default/xui/zh/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_bottomtray.xml
@@ -16,7 +16,7 @@
 			<bottomtray_button label="移動" name="movement_btn" tool_tip="顯示 / 隱� 移動控制"/>
 		</layout_panel>
 		<layout_panel name="cam_panel">
-			<bottomtray_button label="View" name="camera_btn" tool_tip="顯示 / 隱� �影機控制"/>
+			<bottomtray_button label="視角" name="camera_btn" tool_tip="顯示 / 隱� �影機控制"/>
 		</layout_panel>
 		<layout_panel name="snapshot_panel">
 			<bottomtray_button name="snapshots" tool_tip="��快照"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml b/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml
index 6b17302bf1..eda4e99a13 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml
@@ -2,11 +2,11 @@
 <panel name="edit_alpha_panel">
 	<scroll_container name="avatar_alpha_color_panel_scroll">
 		<panel name="avatar_alpha_color_panel">
-			<texture_picker label="下�身��明" name="Lower Alpha" tool_tip="點擊以挑�圖片"/>
-			<texture_picker label="上�身��明" name="Upper Alpha" tool_tip="點擊以挑�圖片"/>
-			<texture_picker label="頭部��明" name="Head Alpha" tool_tip="點擊以挑�圖片"/>
-			<texture_picker label="眼���明" name="Eye Alpha" tool_tip="點擊以挑�圖片"/>
-			<texture_picker label="頭髮��明" name="Hair Alpha" tool_tip="點擊以挑�圖片"/>
+			<texture_picker label="下�身��明" name="Lower Alpha" tool_tip="點擊以挑�圖�"/>
+			<texture_picker label="上�身��明" name="Upper Alpha" tool_tip="點擊以挑�圖�"/>
+			<texture_picker label="頭部��明" name="Head Alpha" tool_tip="點擊以挑�圖�"/>
+			<texture_picker label="眼���明" name="Eye Alpha" tool_tip="點擊以挑�圖�"/>
+			<texture_picker label="頭髮��明" name="Hair Alpha" tool_tip="點擊以挑�圖�"/>
 		</panel>
 	</scroll_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml b/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml
index 99e2874319..40dd61971a 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_eyes_panel">
 	<panel name="avatar_eye_color_panel">
-		<texture_picker label="Iris" name="Iris" tool_tip="點擊以挑�圖片"/>
+		<texture_picker label="Iris" name="Iris" tool_tip="點擊以挑�圖�"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml b/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml
index 9c542366bc..7b39e33a9b 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_gloves_panel">
 	<panel name="avatar_gloves_color_panel">
-		<texture_picker label="�質" name="Fabric" tool_tip="點擊以挑�圖片"/>
+		<texture_picker label="�質" name="Fabric" tool_tip="點擊以挑�圖�"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open color picker"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_hair.xml b/indra/newview/skins/default/xui/zh/panel_edit_hair.xml
index d9ddafac3b..a7440093bc 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_hair.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_hair_panel">
 	<panel name="avatar_hair_color_panel">
-		<texture_picker label="�質" name="Texture" tool_tip="點擊以挑�圖片"/>
+		<texture_picker label="�質" name="Texture" tool_tip="點擊以挑�圖�"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml b/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml
index df85f7deb2..dcef070e2e 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_jacket_panel">
 	<panel name="avatar_jacket_color_panel">
-		<texture_picker label="上�身�質" name="Upper Fabric" tool_tip="點擊以挑�圖片"/>
-		<texture_picker label="下�身�質" name="Lower Fabric" tool_tip="點擊以挑�圖片"/>
+		<texture_picker label="上�身�質" name="Upper Fabric" tool_tip="點擊以挑�圖�"/>
+		<texture_picker label="下�身�質" name="Lower Fabric" tool_tip="點擊以挑�圖�"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open color picker"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_pants.xml b/indra/newview/skins/default/xui/zh/panel_edit_pants.xml
index 76560256f7..01b875f1bd 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_pants.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_pants_panel">
 	<panel name="avatar_pants_color_panel">
-		<texture_picker label="�質" name="Fabric" tool_tip="點擊以挑�圖片"/>
+		<texture_picker label="�質" name="Fabric" tool_tip="點擊以挑�圖�"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="點擊以開啟�色挑�器"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_profile.xml b/indra/newview/skins/default/xui/zh/panel_edit_profile.xml
index 2258e51b85..7734c3a417 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_profile.xml
@@ -26,9 +26,9 @@
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
 			<panel name="data_panel">
-				<text name="display_name_label" value="Display Name:"/>
+				<text name="display_name_label" value="顯示�稱："/>
 				<text name="solo_username_label" value="使用者�稱："/>
-				<button name="set_name" tool_tip="Set Display Name"/>
+				<button name="set_name" tool_tip="設定顯示�稱"/>
 				<text name="user_label" value="使用者�稱："/>
 				<panel name="lifes_images_panel">
 					<panel name="second_life_image_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml
index ecfc1e2fad..f8ff76aa9b 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_shirt_panel">
 	<panel name="avatar_shirt_color_panel">
-		<texture_picker label="�質" name="Fabric" tool_tip="點擊以挑�圖片"/>
+		<texture_picker label="�質" name="Fabric" tool_tip="點擊以挑�圖�"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="點擊以開啟�色挑�器"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml b/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml
index 675caf9e2e..97e43f5753 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_shoes_panel">
 	<panel name="avatar_shoes_color_panel">
-		<texture_picker label="�質" name="Fabric" tool_tip="點擊以挑�圖片"/>
+		<texture_picker label="�質" name="Fabric" tool_tip="點擊以挑�圖�"/>
 		<color_swatch label="�色/色調" name="Color/Tint" tool_tip="點擊以開啟�色挑�器"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_skin.xml b/indra/newview/skins/default/xui/zh/panel_edit_skin.xml
index 22f0279060..fdd6d05ca5 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_skin.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_skin_panel">
 	<panel name="avatar_skin_color_panel">
-		<texture_picker label="Head Tattoos" name="Head Tattoos" tool_tip="點擊以挑�圖片"/>
-		<texture_picker label="Upper Tattoos" name="Upper Tattoos" tool_tip="點擊以挑�圖片"/>
-		<texture_picker label="Lower Tattoos" name="Lower Tattoos" tool_tip="點擊以挑�圖片"/>
+		<texture_picker label="Head Tattoos" name="Head Tattoos" tool_tip="點擊以挑�圖�"/>
+		<texture_picker label="Upper Tattoos" name="Upper Tattoos" tool_tip="點擊以挑�圖�"/>
+		<texture_picker label="Lower Tattoos" name="Lower Tattoos" tool_tip="點擊以挑�圖�"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml
index 5c46f94fe9..10432c16b1 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_skirt_panel">
 	<panel name="avatar_skirt_color_panel">
-		<texture_picker label="�質" name="Fabric" tool_tip="點擊以挑�圖片"/>
+		<texture_picker label="�質" name="Fabric" tool_tip="點擊以挑�圖�"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="點擊以開啟�色挑�器"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_socks.xml b/indra/newview/skins/default/xui/zh/panel_edit_socks.xml
index 09c888f226..6727781740 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_socks.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_socks_panel">
 	<panel name="avatar_socks_color_panel">
-		<texture_picker label="�質" name="Fabric" tool_tip="點擊以挑�圖片"/>
+		<texture_picker label="�質" name="Fabric" tool_tip="點擊以挑�圖�"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="點擊以開啟�色挑�器"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml
index 946f8b22dc..1b34a0e0ee 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_tattoo_panel">
 	<panel name="avatar_tattoo_color_panel">
-		<texture_picker label="頭部刺�" name="Head Tattoo" tool_tip="點擊以挑�圖片"/>
+		<texture_picker label="頭部刺�" name="Head Tattoo" tool_tip="點擊以挑�圖�"/>
 		<texture_picker label="上�身刺�" name="Upper Tattoo" tool_tip="點擊以挑�照片"/>
-		<texture_picker label="下�身刺�" name="Lower Tattoo" tool_tip="點擊以挑�圖片"/>
+		<texture_picker label="下�身刺�" name="Lower Tattoo" tool_tip="點擊以挑�圖�"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="點擊以開啟�色挑�器"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml b/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml
index 82ab70bafc..15cae8d233 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_underpants_panel">
 	<panel name="avatar_underpants_color_panel">
-		<texture_picker label="�質" name="Fabric" tool_tip="點擊以挑�圖片"/>
+		<texture_picker label="�質" name="Fabric" tool_tip="點擊以挑�圖�"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open color picker"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml
index b284668777..486175eb64 100644
--- a/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_undershirt_panel">
 	<panel name="avatar_undershirt_color_panel">
-		<texture_picker label="�質" name="Fabric" tool_tip="點擊以挑�圖片"/>
+		<texture_picker label="�質" name="Fabric" tool_tip="點擊以挑�圖�"/>
 		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open Color Picker"/>
 	</panel>
 	<panel name="accordion_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_group_general.xml b/indra/newview/skins/default/xui/zh/panel_group_general.xml
index f70fbf22a8..55cbf5a617 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_general.xml
@@ -12,7 +12,7 @@ Hover your mouse over the options for more help.
 		Retrieving member data
 	</panel.string>
 	<panel name="group_info_top">
-		<texture_picker label="" name="insignia" tool_tip="點擊以挑�圖片"/>
+		<texture_picker label="" name="insignia" tool_tip="點擊以挑�圖�"/>
 		<text name="prepend_founded_by">
 			創辦人：
 		</text>
@@ -52,6 +52,6 @@ Hover your mouse over the options for more help.
 			<combo_box.item label="�度�人內容" name="mature"/>
 			<combo_box.item label="一般普級內容" name="pg"/>
 		</combo_box>
-		<check_box initial_value="true" label="顯示在�尋中" name="show_in_group_list" tool_tip="Let people see this group in search results"/>
+		<check_box initial_value="true" label="顯示在�尋中" name="show_in_group_list" tool_tip="讓其他人�以在�尋�果中看到這個群組"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_land_money.xml b/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
index 1bf3929683..5ac7410c8b 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
@@ -52,7 +52,7 @@
 			m²
 		</text>
 		<text name="your_contribution_max_value">
-			([AMOUNT] max)
+			（[AMOUNT] 最大）
 		</text>
 		<text name="group_over_limit_text">
 			More land credits are needed to support land in use
@@ -67,14 +67,14 @@
 				載入中...
 			</text_editor>
 		</panel>
-		<panel label="DETAILS" name="group_money_details_tab">
+		<panel label="細節" name="group_money_details_tab">
 			<text_editor name="group_money_details_text">
 				載入中...
 			</text_editor>
 			<button name="earlier_details_button" tool_tip="Back"/>
 			<button name="later_details_button" tool_tip="Next"/>
 		</panel>
-		<panel label="SALES" name="group_money_sales_tab">
+		<panel label="銷售" name="group_money_sales_tab">
 			<text_editor name="group_money_sales_text">
 				載入中...
 			</text_editor>
diff --git a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
index f7dada226f..53ecf3eb19 100644
--- a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Things" name="main inventory panel">
+<panel label="事物" name="main inventory panel">
 	<panel.string name="ItemcountFetching">
 		Fetching [ITEM_COUNT] Items... [FILTER]
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
index 3e44f2a584..321c003acd 100644
--- a/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
@@ -17,8 +17,8 @@
 	<button label="�設" name="current_url_reset_btn"/>
 	<check_box initial_value="false" label="Auto Loop" name="auto_loop"/>
 	<check_box initial_value="false" label="First Click Interacts" name="first_click_interact"/>
-	<check_box initial_value="false" label="Auto Zoom" name="auto_zoom"/>
-	<check_box initial_value="false" label="Auto Play Media" name="auto_play"/>
+	<check_box initial_value="false" label="自動縮放" name="auto_zoom"/>
+	<check_box initial_value="false" label="自動播放媒體" name="auto_play"/>
 	<text name="media_setting_note">
 		Note: Residents can override this setting
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml
index ec62b61c54..173edc76f6 100644
--- a/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml
@@ -14,16 +14,16 @@
 	<text name="owner_label">
 		�有者
 	</text>
-	<check_box initial_value="false" label="Allow Navigation &amp; Interactivity" name="perms_owner_interact"/>
+	<check_box initial_value="false" label="�許導航與互動" name="perms_owner_interact"/>
 	<check_box initial_value="false" label="顯示控制列" name="perms_owner_control"/>
 	<text name="group_label">
 		群組：
 	</text>
-	<check_box initial_value="false" label="Allow Navigation &amp; Interactivity" name="perms_group_interact"/>
+	<check_box initial_value="false" label="�許導航與互動" name="perms_group_interact"/>
 	<check_box initial_value="false" label="顯示控制列" name="perms_group_control"/>
 	<text name="anyone_label">
 		任何人
 	</text>
-	<check_box initial_value="false" label="Allow Navigation &amp; Interactivity" name="perms_anyone_interact"/>
+	<check_box initial_value="false" label="�許導航與互動" name="perms_anyone_interact"/>
 	<check_box initial_value="false" label="顯示控制列" name="perms_anyone_control"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_my_profile.xml b/indra/newview/skins/default/xui/zh/panel_my_profile.xml
index e26ccdef73..79817d7be9 100644
--- a/indra/newview/skins/default/xui/zh/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_my_profile.xml
@@ -31,7 +31,7 @@
 							User name
 						</text>
 						<text name="name_descr_text">
-							Display Name
+							顯示�稱
 						</text>
 						<button label="檔案" name="see_profile_btn" tool_tip="察看這�化身的檔案"/>
 					</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_notes.xml b/indra/newview/skins/default/xui/zh/panel_notes.xml
index 5d0e6760ff..875c6bb328 100644
--- a/indra/newview/skins/default/xui/zh/panel_notes.xml
+++ b/indra/newview/skins/default/xui/zh/panel_notes.xml
@@ -15,7 +15,7 @@
 		<layout_panel name="notes_buttons_panel">
 			<layout_stack name="bottom_bar_ls">
 				<layout_panel name="add_friend_btn_lp">
-					<button label="加為朋�" name="add_friend" tool_tip="Offer friendship to the Resident"/>
+					<button label="加為朋�" name="add_friend" tool_tip="�這個居民�出交�邀請"/>
 				</layout_panel>
 				<layout_panel name="im_btn_lp">
 					<button label="IM" name="im" tool_tip="開啟�時訊�會話"/>
@@ -24,7 +24,7 @@
 					<button label="通話" name="call" tool_tip="與這�居民通話"/>
 				</layout_panel>
 				<layout_panel name="show_on_map_btn_lp">
-					<button label="地圖" name="show_on_map_btn" tool_tip="Show the Resident on the map"/>
+					<button label="地圖" name="show_on_map_btn" tool_tip="在地圖上顯示這個居民"/>
 				</layout_panel>
 				<layout_panel name="teleport_btn_lp">
 					<button label="瞬間傳�" name="teleport" tool_tip="發給瞬間傳�請求"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml
index dfd81a85cc..d9718d8294 100644
--- a/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Things" name="Outfits">
+<panel label="事物" name="Outfits">
 	<panel.string name="wear_outfit_tooltip">
 		穿上所�擇的�扮
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
index c97ff2ae96..9c265622fa 100644
--- a/indra/newview/skins/default/xui/zh/panel_people.xml
+++ b/indra/newview/skins/default/xui/zh/panel_people.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Side tray panel -->
-<panel label="People" name="people_panel">
+<panel label="人群" name="people_panel">
 	<string name="no_recent_people" value="No recent people. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]."/>
 	<string name="no_filtered_recent_people" value="Didn&apos;t find what you&apos;re looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search]."/>
 	<string name="no_one_near" value="No one nearby. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]."/>
diff --git a/indra/newview/skins/default/xui/zh/panel_place_profile.xml b/indra/newview/skins/default/xui/zh/panel_place_profile.xml
index d7bcb0d027..1772b65434 100644
--- a/indra/newview/skins/default/xui/zh/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_place_profile.xml
@@ -66,7 +66,7 @@
 						<text name="build_value" value="On"/>
 						<text name="scripts_label" value="腳本："/>
 						<text name="scripts_value" value="On"/>
-						<text name="damage_label" value="商害："/>
+						<text name="damage_label" value="傷害："/>
 						<text name="damage_value" value="Off"/>
 						<button label="關於土地" name="about_land_btn"/>
 					</panel>
@@ -102,11 +102,11 @@
 						<text name="sales_price_label" value="價格："/>
 						<text name="area_label" value="��："/>
 						<text name="traffic_label" value="��："/>
-						<text name="primitives_label" value="Primitives:"/>
+						<text name="primitives_label" value="幾何元件："/>
 						<text name="parcel_scripts_label" value="腳本："/>
 						<text name="terraform_limits_label" value="土地變形�制："/>
 						<text name="subdivide_label" value="分割土地/�併土地能力："/>
-						<text name="resale_label" value="ReSale ability:"/>
+						<text name="resale_label" value="轉售能力："/>
 						<text name="sale_to_label" value="出售給："/>
 					</panel>
 				</accordion_tab>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
index ee8cd9794a..874fb6b218 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
@@ -47,14 +47,14 @@
 		<text name="DrawDistanceMeterText2">
 			m
 		</text>
-		<slider label="Max. particle count:" name="MaxParticleCount"/>
+		<slider label="最大粒�效果數�：" name="MaxParticleCount"/>
 		<slider label="Max. # of non-impostor avatars:" name="MaxNumberAvatarDrawn"/>
 		<slider label="後製�質：" name="RenderPostProcess"/>
 		<text name="MeshDetailText">
 			網�細節：
 		</text>
 		<slider label="物件：" name="ObjectMeshDetail"/>
-		<slider label="Flexiprims:" name="FlexibleMeshDetail"/>
+		<slider label="彈性幾何元件：" name="FlexibleMeshDetail"/>
 		<slider label="樹木：" name="TreeMeshDetail"/>
 		<slider label="化身：" name="AvatarMeshDetail"/>
 		<slider label="地形：" name="TerrainMeshDetail"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
index 57e3540b3d..ce176b1e3c 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
@@ -15,7 +15,7 @@
 	<check_box label="�轉" name="invert_mouse"/>
 	<check_box label="總是使用方��移動" name="arrow_keys_move_avatar_check"/>
 	<check_box label="連點按�後跑步" name="tap_tap_hold_to_run"/>
-	<check_box label="雙擊以D：" name="double_click_chkbox"/>
+	<check_box label="雙擊以：" name="double_click_chkbox"/>
 	<radio_group name="double_click_action">
 		<radio_item label="瞬間傳�" name="radio_teleport"/>
 		<radio_item label="自動導航駕駛" name="radio_autopilot"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
index bd6d465572..07fdfd87e3 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
@@ -8,7 +8,7 @@
 		（�置�圖��網���尋的歷�紀錄）
 	</text>
 	<check_box label="將我顯示在�尋的�果中" name="online_searchresults"/>
-	<check_box label="�有我的朋�和群組知�我在線上" name="online_visibility"/>
+	<check_box label="�有我的朋�和群組知�我上線" name="online_visibility"/>
 	<check_box label="�有我的朋�和群組�以 IM 或與我通話。" name="voice_call_friends_only_check"/>
 	<check_box label="當通話��時關閉麥克風" name="auto_disengage_mic_check"/>
 	<check_box label="登入時顯示我最愛的地標�置（經由 &apos;開始於&apos; 的下拉��單）" name="favorites_on_login_check"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml
index 8d0e2a6355..df1a1b73a1 100644
--- a/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml
@@ -37,28 +37,28 @@
 			<button name="fwd_btn" tool_tip="Navigate forward"/>
 		</layout_panel>
 		<layout_panel name="home">
-			<button name="home_btn" tool_tip="Home page"/>
+			<button name="home_btn" tool_tip="首�"/>
 		</layout_panel>
 		<layout_panel name="media_stop">
 			<button name="media_stop_btn" tool_tip="�止媒體"/>
 		</layout_panel>
 		<layout_panel name="reload">
-			<button name="reload_btn" tool_tip="Reload"/>
+			<button name="reload_btn" tool_tip="�新載入"/>
 		</layout_panel>
 		<layout_panel name="stop">
-			<button name="stop_btn" tool_tip="Stop loading"/>
+			<button name="stop_btn" tool_tip="�止載入"/>
 		</layout_panel>
 		<layout_panel name="play">
-			<button name="play_btn" tool_tip="Play media"/>
+			<button name="play_btn" tool_tip="播放媒體"/>
 		</layout_panel>
 		<layout_panel name="pause">
-			<button name="pause_btn" tool_tip="Pause media"/>
+			<button name="pause_btn" tool_tip="暫�媒體"/>
 		</layout_panel>
 		<layout_panel name="media_address">
-			<line_editor name="media_address_url" tool_tip="Media URL"/>
+			<line_editor name="media_address_url" tool_tip="媒體網�"/>
 			<layout_stack name="media_address_url_icons">
 				<layout_panel>
-					<icon name="media_whitelist_flag" tool_tip="White List enabled"/>
+					<icon name="media_whitelist_flag" tool_tip="白�單已啟用"/>
 				</layout_panel>
 				<layout_panel>
 					<icon name="media_secure_lock_flag" tool_tip="Secured Browsing"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_profile_view.xml b/indra/newview/skins/default/xui/zh/panel_profile_view.xml
index 12fe776e45..2684287692 100644
--- a/indra/newview/skins/default/xui/zh/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/zh/panel_profile_view.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_target_profile">
 	<string name="status_online">
-		Online
+		上線
 	</string>
 	<string name="status_offline">
-		Offline
+		離線
 	</string>
-	<text name="display_name_label" value="Display Name:"/>
+	<text name="display_name_label" value="顯示�稱："/>
 	<text name="solo_username_label" value="使用者�稱："/>
-	<text name="status" value="Online"/>
+	<text name="status" value="上線"/>
 	<text name="user_name_small" value="Jack oh look at me this is a super duper long name"/>
 	<button name="copy_to_clipboard" tool_tip="覆製到剪貼簿"/>
 	<text name="user_label" value="使用者�稱："/>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_general.xml b/indra/newview/skins/default/xui/zh/panel_region_general.xml
index 38fde494aa..a441b8898d 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_general.xml
@@ -24,7 +24,7 @@
 	<check_box label="�制推撞" name="restrict_pushobject"/>
 	<check_box label="�許土地轉售" name="allow_land_resell_check"/>
 	<check_box label="�許土地 �併/分割" name="allow_parcel_changes_check"/>
-	<check_box label="阻擋土地顯示於�尋中" name="block_parcel_search_check" tool_tip="Let people see this region and its parcels in search results"/>
+	<check_box label="阻擋土地顯示於�尋中" name="block_parcel_search_check" tool_tip="讓其他人�以在�尋�果中看到這個地�與其中的地段"/>
 	<spinner label="人數上�" name="agent_limit_spin"/>
 	<spinner label="Object Bonus" name="object_bonus_spin"/>
 	<text label="Maturity" name="access_text">
diff --git a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
index 0622cb4e73..7cae8fe8cf 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
@@ -6,14 +6,14 @@
 	<text name="region_text">
 		未知
 	</text>
-	<spinner label="Water Height" name="water_height_spin"/>
-	<spinner label="Terrain Raise Limit" name="terrain_raise_spin"/>
-	<spinner label="Terrain Lower Limit" name="terrain_lower_spin"/>
-	<check_box label="Use Estate Sun" name="use_estate_sun_check"/>
-	<check_box label="Fixed Sun" name="fixed_sun_check"/>
+	<spinner label="水文高度" name="water_height_spin"/>
+	<spinner label="地形���制" name="terrain_raise_spin"/>
+	<spinner label="地形�低�制" name="terrain_lower_spin"/>
+	<check_box label="使用領地的太陽設定" name="use_estate_sun_check"/>
+	<check_box label="固定太陽" name="fixed_sun_check"/>
 	<slider label="Phase" name="sun_hour_slider"/>
 	<button label="套用" name="apply_btn"/>
-	<button label="Download RAW terrain..." name="download_raw_btn" tool_tip="Available only to estate owners, not managers"/>
-	<button label="上傳 RAW 地形檔..." name="upload_raw_btn" tool_tip="Available only to estate owners, not managers"/>
+	<button label="下載 RAW 地形..." name="download_raw_btn" tool_tip="��許領地�有者而�管�者進行�作"/>
+	<button label="上傳 RAW 地形檔..." name="upload_raw_btn" tool_tip="��許領地�有者而�管�者進行�作"/>
 	<button label="Bake Terrain" name="bake_terrain_btn" tool_tip="Set current terrain as mid-point for raise/lower limits"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_script_ed.xml b/indra/newview/skins/default/xui/zh/panel_script_ed.xml
index 1dc7c1e089..cc2b0fc673 100644
--- a/indra/newview/skins/default/xui/zh/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/zh/panel_script_ed.xml
@@ -4,7 +4,7 @@
 		載入中...
 	</panel.string>
 	<panel.string name="can_not_view">
-		你�察看或編輯此腳本，自從它被設定為 &quot;no copy&quot; 後。你需�完整權�去察看或編輯有包�腳本在內的物件。
+		你�能察看或編輯此腳本，自從它被設定為 &quot;no copy&quot; 後。你需�完整權�去察看或編輯有包�腳本在內的物件。
 	</panel.string>
 	<panel.string name="public_objects_can_not_run">
 		公開物件�能執行腳本
diff --git a/indra/newview/skins/default/xui/zh/panel_side_tray.xml b/indra/newview/skins/default/xui/zh/panel_side_tray.xml
index b706f1839a..e5c7deb7d6 100644
--- a/indra/newview/skins/default/xui/zh/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_side_tray.xml
@@ -11,7 +11,7 @@
 			<panel label="自己" name="panel_me"/>
 		</panel_container>
 	</sidetray_tab>
-	<sidetray_tab description="Find your friends, contacts and people nearby." name="sidebar_people" tab_title="People">
+	<sidetray_tab description="Find your friends, contacts and people nearby." name="sidebar_people" tab_title="人群">
 		<panel_container name="panel_container">
 			<panel label="群組檔案" name="panel_group_info_sidetray"/>
 			<panel label="Blocked Residents &amp; Objects" name="panel_block_list_sidetray"/>
diff --git a/indra/newview/skins/default/xui/zh/role_actions.xml b/indra/newview/skins/default/xui/zh/role_actions.xml
index d5c3096b22..32bf0d22d8 100644
--- a/indra/newview/skins/default/xui/zh/role_actions.xml
+++ b/indra/newview/skins/default/xui/zh/role_actions.xml
@@ -18,7 +18,7 @@
 		<action description="Change Charter, Insignia, and &apos;Show in search&apos;" longdescription="Change Charter, Insignia, and &apos;Show in search&apos;. This is done in the General section." name="group change identity" value="11"/>
 	</action_set>
 	<action_set description="These Abilities include powers to deed, modify, and sell land in this group&apos;s land holdings. To get to the About Land window, right-click the ground and select &apos;About Land&apos;, or click the &apos;i&apos; icon in the Navigation Bar." name="Parcel Management">
-		<action description="Deed land and buy land for group" longdescription="Deed land and buy land for group. This is done in About Land &gt; General tab." name="land deed" value="12"/>
+		<action description="讓渡土地或購買土地給群組" longdescription="Deed land and buy land for group. This is done in About Land &gt; General tab." name="land deed" value="12"/>
 		<action description="Abandon land to Governor Linden" longdescription="Abandon land to Governor Linden. *WARNING* Any Member in a Role with this Ability can abandon group-owned land in About Land &gt; General tab, reverting it to Linden ownership without a sale! Be sure you know what you&apos;re doing before assigning this Ability." name="land release" value="13"/>
 		<action description="Set land for sale info" longdescription="Set land for sale info. *WARNING* Any Member in a Role with this Ability can sell group-owned land in About Land &gt; General tab as they wish! Be sure you know what you&apos;re doing before assigning this Ability." name="land set sale info" value="14"/>
 		<action description="Subdivide and join parcels" longdescription="Subdivide and join parcels. This is done by right-clicking the ground, &apos;Edit Terrain&apos;, and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click &apos;Subdivide&apos;. To join, select two or more contiguous parcels and click &apos;Join&apos;." name="land divide join" value="15"/>
@@ -54,7 +54,7 @@
 		<action description="Landscaping using Linden plants" longdescription="Landscaping ability to place and move Linden trees, plants, and grasses. These items can be found in your inventory&apos;s Library &gt; Objects folder, or they can be created via the Build menu." name="land gardening" value="35"/>
 	</action_set>
 	<action_set description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Build Tools &gt; General tab. Right-click an object and Edit to see its settings." name="Object Management">
-		<action description="Deed objects to group" longdescription="Deed objects to group in the Build Tools &gt; General tab." name="object deed" value="36"/>
+		<action description="讓渡物件給群組" longdescription="Deed objects to group in the Build Tools &gt; General tab." name="object deed" value="36"/>
 		<action description="Manipulate (move, copy, modify) group-owned objects" longdescription="Manipulate (move, copy, modify) group-owned objects in the Build Tools &gt; General tab." name="object manipulate" value="38"/>
 		<action description="Set group-owned objects for sale" longdescription="Set group-owned objects for sale in the Build Tools &gt; General tab." name="object set sale" value="39"/>
 	</action_set>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml
index 4cc16ed250..7abe95a402 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Things" name="objects panel">
+<panel label="事物" name="objects panel">
 	<panel label="" name="sidepanel__inventory_panel">
 		<panel name="button_panel">
 			<layout_stack name="button_panel_ls">
@@ -11,8 +11,8 @@
 				</layout_panel>
 				<layout_panel name="shop_btn_lp">
 					<button label="Shop" name="shop_btn" tool_tip="Open Marketplace webpage"/>
-					<button label="Wear" name="wear_btn" tool_tip="穿上所�擇的�扮"/>
-					<button label="Play" name="play_btn"/>
+					<button label="穿上" name="wear_btn" tool_tip="穿上所�擇的�扮"/>
+					<button label="播放" name="play_btn"/>
 					<button label="瞬間傳�" name="teleport_btn" tool_tip="瞬間傳�到所�的�域"/>
 				</layout_panel>
 			</layout_stack>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
index 5aad4568bd..3d46e52726 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="object properties" title="物件檔案">
 	<panel.string name="text deed continued">
-		Deed
+		讓渡
 	</panel.string>
 	<panel.string name="text deed">
-		Deed
+		讓渡
 	</panel.string>
 	<panel.string name="text modify info 1">
 		你�以修改這個物件
@@ -56,7 +56,7 @@
 		</text>
 		<button name="button set group" tool_tip="�擇一個群組以分享這個物件的權�"/>
 		<name_box initial_value="載入中..." name="Group Name Proxy"/>
-		<button label="Deed" label_selected="Deed" name="button deed" tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."/>
+		<button label="讓渡" label_selected="讓渡" name="button deed" tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."/>
 		<text name="label click action">
 			點擊以：
 		</text>
@@ -85,16 +85,16 @@
 			</text>
 			<check_box label="修改" name="checkbox next owner can modify"/>
 			<check_box label="覆製" name="checkbox next owner can copy"/>
-			<check_box label="轉移" name="checkbox next owner can transfer" tool_tip="Next owner can give away or resell this object"/>
+			<check_box label="轉移" name="checkbox next owner can transfer" tool_tip="下一個�有者�以�出或轉售這個物件"/>
 		</panel>
 		<check_box label="出售" name="checkbox for sale"/>
 		<combo_box name="sale type">
-			<combo_box.item label="Copy" name="Copy"/>
-			<combo_box.item label="Contents" name="Contents"/>
-			<combo_box.item label="Original" name="Original"/>
+			<combo_box.item label="副本" name="Copy"/>
+			<combo_box.item label="內容" name="Contents"/>
+			<combo_box.item label="原件" name="Original"/>
 		</combo_box>
 		<spinner label="價格： L$" name="Edit Cost"/>
-		<check_box label="顯示在�尋中" name="search_check" tool_tip="Let people see this object in search results"/>
+		<check_box label="顯示在�尋中" name="search_check" tool_tip="讓其他人�以在�尋�果中察看到此物件"/>
 		<text name="B:">
 			B:
 		</text>
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 0949e61fa1..6dbe44d32e 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -1042,10 +1042,10 @@
 		按下 ESC �回復到世界的視角
 	</string>
 	<string name="InventoryNoMatchingItems">
-		Didn&apos;t find what you&apos;re looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search].
+		沒有發�你想�找的嗎？試試 [secondlife:///app/search/all/[SEARCH_TERM] �尋]。
 	</string>
 	<string name="PlacesNoMatchingItems">
-		Didn&apos;t find what you&apos;re looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search].
+		沒有發�你想�找的嗎？試試 [secondlife:///app/search/places/[SEARCH_TERM] �尋]。
 	</string>
 	<string name="FavoritesNoMatchingItems">
 		Drag a landmark here to add it to your favorites.
@@ -1190,25 +1190,25 @@
 		Buy for L$
 	</string>
 	<string name="Stone">
-		Stone
+		石頭
 	</string>
 	<string name="Metal">
-		Metal
+		金屬
 	</string>
 	<string name="Glass">
-		Glass
+		玻璃
 	</string>
 	<string name="Wood">
-		Wood
+		木頭
 	</string>
 	<string name="Flesh">
-		Flesh
+		肌肉
 	</string>
 	<string name="Plastic">
-		Plastic
+		塑膠
 	</string>
 	<string name="Rubber">
-		Rubber
+		橡膠
 	</string>
 	<string name="Light">
 		Light
@@ -1385,7 +1385,7 @@
 		Charter Member
 	</string>
 	<string name="AcctTypeEmployee">
-		Linden Lab Employee
+		林登實驗室員工
 	</string>
 	<string name="PaymentInfoUsed">
 		Payment Info Used
@@ -1433,7 +1433,7 @@
 		伺�器上未發�腳本。
 	</string>
 	<string name="CompileQueueProblemDownloading">
-		Problem downloading
+		�題下載中
 	</string>
 	<string name="CompileQueueInsufficientPermDownload">
 		Insufficient permissions to download a script.
@@ -1491,7 +1491,7 @@
 		（未知）
 	</string>
 	<string name="SummaryForTheWeek" value="Summary for this week, beginning on"/>
-	<string name="NextStipendDay" value="The next stipend day is"/>
+	<string name="NextStipendDay" value="下一個發薪日為"/>
 	<string name="GroupIndividualShare" value="Group       Individual Share"/>
 	<string name="GroupColumn" value="群組"/>
 	<string name="Balance">
@@ -1507,7 +1507,7 @@
 		Total
 	</string>
 	<string name="NoGroupDataFound">
-		No group data found for group
+		無群組資料發�
 	</string>
 	<string name="IMParentEstate">
 		parent estate
@@ -1540,13 +1540,13 @@
 		地段腳本記憶體
 	</string>
 	<string name="ScriptLimitsParcelsOwned">
-		Parcels Listed: [PARCELS]
+		地段清單：[PARCELS]
 	</string>
 	<string name="ScriptLimitsMemoryUsed">
-		Memory used: [COUNT] kb out of [MAX] kb; [AVAILABLE] kb available
+		計憶體用�：使用 [MAX] kb 中的 [COUNT] kb ；剩餘 [AVAILABLE] kb �用
 	</string>
 	<string name="ScriptLimitsMemoryUsedSimple">
-		Memory used: [COUNT] kb
+		記憶體用�：[COUNT] kb
 	</string>
 	<string name="ScriptLimitsParcelScriptURLs">
 		地段腳本 URLs
@@ -1573,7 +1573,7 @@
 		You do not have permission to examine this parcel
 	</string>
 	<string name="SITTING_ON">
-		Sitting On
+		�在
 	</string>
 	<string name="ATTACH_CHEST">
 		胸部
@@ -1759,7 +1759,7 @@
 		�覽
 	</string>
 	<string name="MultiPropertiesTitle">
-		Properties
+		屬性
 	</string>
 	<string name="InvOfferAnObjectNamed">
 		An object named
@@ -1889,40 +1889,40 @@
 		PDT
 	</string>
 	<string name="Direction_Forward">
-		Forward
+		��
 	</string>
 	<string name="Direction_Left">
-		Left
+		�左
 	</string>
 	<string name="Direction_Right">
-		Right
+		��
 	</string>
 	<string name="Direction_Back">
-		Back
+		�後
 	</string>
 	<string name="Direction_North">
-		North
+		北
 	</string>
 	<string name="Direction_South">
-		South
+		�
 	</string>
 	<string name="Direction_West">
-		West
+		西
 	</string>
 	<string name="Direction_East">
-		East
+		�
 	</string>
 	<string name="Direction_Up">
-		Up
+		�上
 	</string>
 	<string name="Direction_Down">
-		Down
+		�下
 	</string>
 	<string name="Any Category">
 		任何類別
 	</string>
 	<string name="Shopping">
-		Shopping
+		採購
 	</string>
 	<string name="Land Rental">
 		Land Rental
@@ -1958,28 +1958,28 @@
 		完全�人
 	</string>
 	<string name="Arts&amp;Culture">
-		Arts &amp; Culture
+		�術與文化
 	</string>
 	<string name="Business">
-		Business
+		商業
 	</string>
 	<string name="Educational">
-		Educational
+		教育
 	</string>
 	<string name="Gaming">
-		Gaming
+		�戲
 	</string>
 	<string name="Hangout">
 		�會所
 	</string>
 	<string name="Newcomer Friendly">
-		Newcomer Friendly
+		新手�善
 	</string>
 	<string name="Parks&amp;Nature">
-		Parks &amp; Nature
+		公園與自然
 	</string>
 	<string name="Residential">
-		Residential
+		�宅
 	</string>
 	<string name="Stage">
 		Stage
@@ -2024,36 +2024,36 @@
 		---
 	</string>
 	<string name="Multiple Media">
-		Multiple Media
+		多媒體
 	</string>
 	<string name="Play Media">
-		Play/Pause Media
+		播放�暫� 媒體
 	</string>
 	<string name="MBCmdLineError">
-		An error was found parsing the command line.
-Please see: http://wiki.secondlife.com/wiki/Client_parameters
-Error:
+		解�命令列時發�錯誤。
+請�閱： http://wiki.secondlife.com/wiki/Client_parameters
+錯誤：
 	</string>
 	<string name="MBCmdLineUsg">
-		[APP_NAME] Command line usage:
+		[APP_NAME] 命令列用法：
 	</string>
 	<string name="MBUnableToAccessFile">
-		[APP_NAME] is unable to access a file that it needs.
+		[APP_NAME] 無法存�它所需�的檔案。
 
 This can be because you somehow have multiple copies running, or your system incorrectly thinks a file is open.
 If this message persists, restart your computer and try again.
 If it continues to persist, you may need to completely uninstall [APP_NAME] and reinstall it.
 	</string>
 	<string name="MBFatalError">
-		Fatal Error
+		致命錯誤
 	</string>
 	<string name="MBRequiresAltiVec">
 		[APP_NAME] requires a processor with AltiVec (G4 or later).
 	</string>
 	<string name="MBAlreadyRunning">
-		[APP_NAME] is already running.
-Check your task bar for a minimized copy of the program.
-If this message persists, restart your computer.
+		[APP_NAME] 已經在執行中。
+請檢查你的工作列裡是�有其他最�化的相�程�。
+如果這個訊��續出�，請�新啟動你的電腦。
 	</string>
 	<string name="MBFrozenCrashed">
 		[APP_NAME] appears to have frozen or crashed on the previous run.
@@ -2082,8 +2082,8 @@ Please download the latest version from www.secondlife.com.
 		錯誤
 	</string>
 	<string name="MBFullScreenErr">
-		Unable to run fullscreen at [WIDTH] x [HEIGHT].
-Running in window.
+		無法執行全螢幕於 [WIDTH] x [HEIGHT].
+執行於視窗中。
 	</string>
 	<string name="MBDestroyWinFailed">
 		Shutdown Error while destroying window (DestroyWindow() failed)
@@ -2111,7 +2111,7 @@ Also be sure your monitor is set to True Color (32-bit) in Control Panels &gt; D
 If you continue to receive this message, contact the [SUPPORT_SITE].
 	</string>
 	<string name="MBPixelFmtSetErr">
-		Can&apos;t set pixel format
+		無法設定�素格�
 	</string>
 	<string name="MBGLContextErr">
 		Can&apos;t create GL rendering context
@@ -2920,7 +2920,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Middle Part
 	</string>
 	<string name="More">
-		More
+		更多
 	</string>
 	<string name="More Blush">
 		More Blush
@@ -3559,7 +3559,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		購買這塊土地
 	</string>
 	<string name="LocationCtrlVoiceTooltip">
-		Voice not available here
+		此地並��許語音
 	</string>
 	<string name="LocationCtrlFlyTooltip">
 		��許飛行
@@ -3568,13 +3568,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		�止推撞
 	</string>
 	<string name="LocationCtrlBuildTooltip">
-		Building/dropping objects not allowed
+		建造�丟棄 物件�被�許
 	</string>
 	<string name="LocationCtrlScriptsTooltip">
-		Scripts not allowed
+		腳本�被�許
 	</string>
 	<string name="LocationCtrlDamageTooltip">
-		Health
+		�康
 	</string>
 	<string name="LocationCtrlAdultIconTooltip">
 		完全�人地�
@@ -3628,7 +3628,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		[NAME] 正在輸入...
 	</string>
 	<string name="Unnamed">
-		(Unnamed)
+		（未命�）
 	</string>
 	<string name="IM_moderated_chat_label">
 		(Moderated: Voices off by default)
@@ -3670,10 +3670,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Connected, click Leave Call to hang up
 	</string>
 	<string name="hang_up-im">
-		Left voice call
+		離開語音通話
 	</string>
 	<string name="answering-im">
-		Connecting...
+		�接中...
 	</string>
 	<string name="conference-title">
 		Ad-hoc Conference
@@ -3715,10 +3715,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		此會話��存在
 	</string>
 	<string name="no_ability_error">
-		You do not have that ability.
+		你並�具有這個能力。
 	</string>
 	<string name="no_ability">
-		You do not have that ability.
+		你並�具有這個能力。
 	</string>
 	<string name="not_a_mod_error">
 		You are not a session moderator.
@@ -3903,7 +3903,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		內容
 	</string>
 	<string name="Gesture">
-		Gesture
+		姿勢
 	</string>
 	<string name="Male Gestures">
 		男性姿勢
@@ -4048,7 +4048,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		US$ [AMOUNT]
 	</string>
 	<string name="Membership">
-		Membership
+		�員資格
 	</string>
 	<string name="Roles">
 		角色
@@ -4057,13 +4057,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Group Identity
 	</string>
 	<string name="Parcel Management">
-		Parcel Management
+		地段管�
 	</string>
 	<string name="Parcel Identity">
 		Parcel Identity
 	</string>
 	<string name="Parcel Settings">
-		Parcel Settings
+		地段設定
 	</string>
 	<string name="Parcel Powers">
 		Parcel Powers
@@ -4075,10 +4075,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Parcel Content
 	</string>
 	<string name="Object Management">
-		Object Management
+		物件管�
 	</string>
 	<string name="Accounting">
-		Accounting
+		會計
 	</string>
 	<string name="Notices">
 		通知
@@ -4087,16 +4087,16 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		�天
 	</string>
 	<string name="DeleteItems">
-		Delete selected items?
+		刪除所��的物�？
 	</string>
 	<string name="DeleteItem">
-		Delete selected item?
+		刪除所��的物�？
 	</string>
 	<string name="EmptyOutfitText">
 		沒有任何物�在這個�扮內
 	</string>
 	<string name="ExternalEditorNotSet">
-		Select an editor using the ExternalEditor setting.
+		�擇一個編輯器使用 ExternalEditor 設定。
 	</string>
 	<string name="ExternalEditorNotFound">
 		Cannot find the external editor you specified.
@@ -4107,7 +4107,7 @@ Try enclosing path to the editor with double quotes.
 		Error parsing the external editor command.
 	</string>
 	<string name="ExternalEditorFailedToRun">
-		External editor failed to run.
+		執行外部編輯器失敗。
 	</string>
 	<string name="Esc">
 		Esc