merging in latest mesh-development

95 files changed, 2980 insertions, 1371 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 66e8610d59..870ef5f399 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4004,7 +4004,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://search-beta.secondlife.com/viewer/[CATEGORY]/?q=[QUERY]&amp;p=[AUTH_TOKEN]&amp;r=[MATURITY]&amp;lang=[LANGUAGE]&amp;g=[GODLIKE]&amp;sid=[SESSION_ID]&amp;rid=[REGION_ID]&amp;pid=[PARCEL_ID]&amp;channel=[CHANNEL]&amp;version=[VERSION]&amp;major=[VERSION_MAJOR]&amp;minor=[VERSION_MINOR]&amp;patch=[VERSION_PATCH]&amp;build=[VERSION_BUILD]</string>
+      <string>http://search-beta.secondlife.com/viewer/[CATEGORY]/?q=[QUERY]</string>
     </map>
     <key>WebProfileURL</key>
     <map>
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index f22b02093f..4cdfcea64e 100755
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -697,12 +697,8 @@ std::set<LLUUID> LLAvatarActions::getInventorySelectedUUIDs()
 	if (inventory_selected_uuids.empty())
 	{
 		LLSidepanelInventory * sidepanel_inventory = LLSideTray::getInstance()->getPanel<LLSidepanelInventory>("sidepanel_inventory");
-		LLInventoryPanel * inbox = sidepanel_inventory->findChild<LLInventoryPanel>("inventory_inbox");
-		if (inbox)
-		{
-			inventory_selected_uuids = inbox->getRootFolder()->getSelectionList();
-		}
 
+		inventory_selected_uuids = sidepanel_inventory->getInboxOrOutboxSelectionList();
 	}
 
 	return inventory_selected_uuids;
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index 9f790d03fe..984014f309 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -1283,30 +1283,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;
@@ -1407,6 +1415,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)
@@ -1437,7 +1450,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/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index 0ea0e41dfa..db9a0424c0 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -106,7 +106,7 @@ BOOL LLFeatureList::isFeatureAvailable(const std::string& name)
 		return mFeatures[name].mAvailable;
 	}
 
-	LL_WARNS("RenderInit") << "Feature " << name << " not on feature list!" << LL_ENDL;
+	LL_WARNS_ONCE("RenderInit") << "Feature " << name << " not on feature list!" << LL_ENDL;
 	
 	// changing this to TRUE so you have to explicitly disable 
 	// something for it to be disabled
@@ -120,7 +120,7 @@ F32 LLFeatureList::getRecommendedValue(const std::string& name)
 		return mFeatures[name].mRecommendedLevel;
 	}
 
-	LL_WARNS("RenderInit") << "Feature " << name << " not on feature list or not available!" << LL_ENDL;
+	LL_WARNS_ONCE("RenderInit") << "Feature " << name << " not on feature list or not available!" << LL_ENDL;
 	return 0;
 }
 
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 0ce8dcd46b..d55849d2fb 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -2705,6 +2705,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
@@ -3173,11 +3179,6 @@ void LLModelPreview::rebuildUploadData()
 
 	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;
@@ -3262,7 +3263,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);
 
diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp
index 2a946b1edf..23cc23376f 100644
--- a/indra/newview/llfloatersearch.cpp
+++ b/indra/newview/llfloatersearch.cpp
@@ -27,16 +27,26 @@
 
 #include "llviewerprecompiledheaders.h"
 
+#include "llappviewer.h"
+#include "llbase64.h"
 #include "llcommandhandler.h"
 #include "llfloaterreg.h"
 #include "llfloatersearch.h"
 #include "llmediactrl.h"
 #include "llnotificationsutil.h"
+#include "llparcel.h"
+#include "llplugincookiestore.h"
 #include "lllogininstance.h"
 #include "lluri.h"
 #include "llagent.h"
+#include "llsdserialize.h"
 #include "llui.h"
 #include "llviewercontrol.h"
+#include "llviewerregion.h"
+#include "llversioninfo.h"
+#include "llviewermedia.h"
+#include "llviewernetwork.h"
+#include "llviewerparcelmgr.h"
 #include "llweb.h"
 
 // support secondlife:///app/search/{CATEGORY}/{QUERY} SLapps
@@ -168,12 +178,14 @@ void LLFloaterSearch::search(const SearchQuery &p)
 
 	// add the permissions token that login.cgi gave us
 	// We use "search_token", and fallback to "auth_token" if not present.
+	LLSD search_cookie;
+
 	LLSD search_token = LLLoginInstance::getInstance()->getResponse("search_token");
 	if (search_token.asString().empty())
 	{
 		search_token = LLLoginInstance::getInstance()->getResponse("auth_token");
 	}
-	subs["AUTH_TOKEN"] = search_token.asString();
+	search_cookie["AUTH_TOKEN"] = search_token.asString();
 
 	// add the user's preferred maturity (can be changed via prefs)
 	std::string maturity;
@@ -189,10 +201,57 @@ void LLFloaterSearch::search(const SearchQuery &p)
 	{
 		maturity = "13";  // PG
 	}
-	subs["MATURITY"] = maturity;
+	search_cookie["MATURITY"] = maturity;
 
 	// add the user's god status
-	subs["GODLIKE"] = gAgent.isGodlike() ? "1" : "0";
+	search_cookie["GODLIKE"] = gAgent.isGodlike() ? "1" : "0";
+	search_cookie["VERSION"] = LLVersionInfo::getVersion();
+	search_cookie["VERSION_MAJOR"] = LLVersionInfo::getMajor();
+	search_cookie["VERSION_MINOR"] = LLVersionInfo::getMinor();
+	search_cookie["VERSION_PATCH"] = LLVersionInfo::getPatch();
+	search_cookie["VERSION_BUILD"] = LLVersionInfo::getBuild();
+	search_cookie["CHANNEL"] = LLVersionInfo::getChannel();
+	search_cookie["GRID"] = LLGridManager::getInstance()->getGridLabel();
+	search_cookie["OS"] = LLAppViewer::instance()->getOSInfo().getOSStringSimple();
+	search_cookie["SESSION_ID"] = gAgent.getSessionID();
+	search_cookie["FIRST_LOGIN"] = gAgent.isFirstLogin();
+
+	std::string lang = LLUI::getLanguage();
+	if (lang == "en-us")
+	{
+		lang = "en";
+	}
+	search_cookie["LANGUAGE"] = lang;
+
+	// find the region ID
+	LLUUID region_id;
+	LLViewerRegion *region = gAgent.getRegion();
+	if (region)
+	{
+		region_id = region->getRegionID();
+	}
+	search_cookie["REGION_ID"] = region_id;
+
+	// find the parcel local ID
+	S32 parcel_id = 0;
+	LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+	if (parcel)
+	{
+		parcel_id = parcel->getLocalID();
+	}
+	search_cookie["PARCEL_ID"] = llformat("%d", parcel_id);
+
+	std::stringstream cookie_string_stream;
+	LLSDSerialize::toXML(search_cookie, cookie_string_stream);
+	std::string cookie_string = cookie_string_stream.str();
+
+	U8* cookie_string_buffer = (U8*)cookie_string.c_str();
+	std::string cookie_value = LLBase64::encode(cookie_string_buffer, cookie_string.size());
+
+	// for staging services
+	LLViewerMedia::getCookieStore()->setCookiesFromHost(std::string("viewer_session_info=") + cookie_value, ".lindenlab.com");
+	// for live services
+	LLViewerMedia::getCookieStore()->setCookiesFromHost(std::string("viewer_session_info=") + cookie_value, ".secondlife.com");
 
 	// get the search URL and expand all of the substitutions
 	// (also adds things like [LANGUAGE], [VERSION], [OS], etc.)
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 98a14f72dc..137b5446cf 100755
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -237,16 +237,19 @@ const LLUUID LLFloaterWorldMap::sHomeID( "10000000-0000-0000-0000-000000000001"
 
 LLFloaterWorldMap::LLFloaterWorldMap(const LLSD& key)
 :	LLFloater(key),
-mInventory(NULL),
-mInventoryObserver(NULL),
-mFriendObserver(NULL),
-mCompletingRegionName(),
-mCompletingRegionPos(),
-mWaitingForTracker(FALSE),
-mIsClosing(FALSE),
-mSetToUserPosition(TRUE),
-mTrackedLocation(0,0,0),
-mTrackedStatus(LLTracker::TRACKING_NOTHING)
+	mInventory(NULL),
+	mInventoryObserver(NULL),
+	mFriendObserver(NULL),
+	mCompletingRegionName(),
+	mCompletingRegionPos(),
+	mWaitingForTracker(FALSE),
+	mIsClosing(FALSE),
+	mSetToUserPosition(TRUE),
+	mTrackedLocation(0,0,0),
+	mTrackedStatus(LLTracker::TRACKING_NOTHING),
+	mListFriendCombo(NULL),
+	mListLandmarkCombo(NULL),
+	mListSearchResults(NULL)
 {
 	gFloaterWorldMap = this;
 	
@@ -281,17 +284,20 @@ BOOL LLFloaterWorldMap::postBuild()
 	avatar_combo->selectFirstItem();
 	avatar_combo->setPrearrangeCallback( boost::bind(&LLFloaterWorldMap::onAvatarComboPrearrange, this) );
 	avatar_combo->setTextEntryCallback( boost::bind(&LLFloaterWorldMap::onComboTextEntry, this) );
+	mListFriendCombo = dynamic_cast<LLCtrlListInterface *>(avatar_combo);
 	
 	LLSearchEditor *location_editor = getChild<LLSearchEditor>("location");
 	location_editor->setFocusChangedCallback(boost::bind(&LLFloaterWorldMap::onLocationFocusChanged, this, _1));
 	location_editor->setKeystrokeCallback( boost::bind(&LLFloaterWorldMap::onSearchTextEntry, this));
 	
 	getChild<LLScrollListCtrl>("search_results")->setDoubleClickCallback( boost::bind(&LLFloaterWorldMap::onClickTeleportBtn, this));
+	mListSearchResults = childGetListInterface("search_results");
 	
 	LLComboBox *landmark_combo = getChild<LLComboBox>( "landmark combo");
 	landmark_combo->selectFirstItem();
 	landmark_combo->setPrearrangeCallback( boost::bind(&LLFloaterWorldMap::onLandmarkComboPrearrange, this) );
 	landmark_combo->setTextEntryCallback( boost::bind(&LLFloaterWorldMap::onComboTextEntry, this) );
+	mListLandmarkCombo = dynamic_cast<LLCtrlListInterface *>(landmark_combo);
 	
 	mCurZoomVal = log(LLWorldMapView::sMapScale)/log(2.f);
 	getChild<LLUICtrl>("zoom slider")->setValue(LLWorldMapView::sMapScale);
@@ -864,7 +870,7 @@ void LLFloaterWorldMap::friendsChanged()
 // No longer really builds a list.  Instead, just updates mAvatarCombo.
 void LLFloaterWorldMap::buildAvatarIDList()
 {
-	LLCtrlListInterface *list = childGetListInterface("friend combo");
+	LLCtrlListInterface *list = mListFriendCombo;
 	if (!list) return;
 	
     // Delete all but the "None" entry
@@ -894,7 +900,7 @@ void LLFloaterWorldMap::buildAvatarIDList()
 
 void LLFloaterWorldMap::buildLandmarkIDLists()
 {
-	LLCtrlListInterface *list = childGetListInterface("landmark combo");
+	LLCtrlListInterface *list = mListLandmarkCombo;
 	if (!list) return;
 	
     // Delete all but the "None" entry
@@ -955,7 +961,7 @@ F32 LLFloaterWorldMap::getDistanceToDestination(const LLVector3d &destination,
 
 void LLFloaterWorldMap::clearLocationSelection(BOOL clear_ui)
 {
-	LLCtrlListInterface *list = childGetListInterface("search_results");
+	LLCtrlListInterface *list = mListSearchResults;
 	if (list)
 	{
 		list->operateOnAll(LLCtrlListInterface::OP_DELETE);
@@ -969,7 +975,7 @@ void LLFloaterWorldMap::clearLandmarkSelection(BOOL clear_ui)
 {
 	if (clear_ui || !childHasKeyboardFocus("landmark combo"))
 	{
-		LLCtrlListInterface *list = childGetListInterface("landmark combo");
+		LLCtrlListInterface *list = mListLandmarkCombo;
 		if (list)
 		{
 			list->selectByValue( "None" );
@@ -983,7 +989,7 @@ void LLFloaterWorldMap::clearAvatarSelection(BOOL clear_ui)
 	if (clear_ui || !childHasKeyboardFocus("friend combo"))
 	{
 		mTrackedStatus = LLTracker::TRACKING_NOTHING;
-		LLCtrlListInterface *list = childGetListInterface("friend combo");
+		LLCtrlListInterface *list = mListFriendCombo;
 		if (list)
 		{
 			list->selectByValue( "None" );
@@ -1051,7 +1057,7 @@ void LLFloaterWorldMap::onLandmarkComboPrearrange( )
 		return;
 	}
 	
-	LLCtrlListInterface *list = childGetListInterface("landmark combo");
+	LLCtrlListInterface *list = mListLandmarkCombo;
 	if (!list) return;
 	
 	LLUUID current_choice = list->getCurrentID();
@@ -1087,7 +1093,7 @@ void LLFloaterWorldMap::onLandmarkComboCommit()
 		return;
 	}
 	
-	LLCtrlListInterface *list = childGetListInterface("landmark combo");
+	LLCtrlListInterface *list = mListLandmarkCombo;
 	if (!list) return;
 	
 	LLUUID asset_id;
@@ -1134,7 +1140,7 @@ void LLFloaterWorldMap::onAvatarComboPrearrange( )
 		return;
 	}
 	
-	LLCtrlListInterface *list = childGetListInterface("friend combo");
+	LLCtrlListInterface *list = mListFriendCombo;
 	if (!list) return;
 	
 	LLUUID current_choice;
@@ -1159,7 +1165,7 @@ void LLFloaterWorldMap::onAvatarComboCommit()
 		return;
 	}
 	
-	LLCtrlListInterface *list = childGetListInterface("friend combo");
+	LLCtrlListInterface *list = mListFriendCombo;
 	if (!list) return;
 	
 	const LLUUID& new_avatar_id = list->getCurrentID();
@@ -1559,7 +1565,7 @@ void LLFloaterWorldMap::updateSims(bool found_null_sim)
 
 void LLFloaterWorldMap::onCommitSearchResult()
 {
-	LLCtrlListInterface *list = childGetListInterface("search_results");
+	LLCtrlListInterface *list = mListSearchResults;
 	if (!list) return;
 	
 	LLSD selected_value = list->getSelectedValue();
diff --git a/indra/newview/llfloaterworldmap.h b/indra/newview/llfloaterworldmap.h
index 783d9f4819..e3b83b2579 100644
--- a/indra/newview/llfloaterworldmap.h
+++ b/indra/newview/llfloaterworldmap.h
@@ -39,6 +39,7 @@
 #include "lltracker.h"
 #include "llslurl.h"
 
+class LLCtrlListInterface;
 class LLFriendObserver;
 class LLInventoryModel;
 class LLInventoryObserver;
@@ -190,6 +191,10 @@ private:
 	std::string				mTrackedSimName;
 	std::string				mTrackedAvatarName;
 	LLSLURL  				mSLURL;
+
+	LLCtrlListInterface *	mListFriendCombo;
+	LLCtrlListInterface *	mListLandmarkCombo;
+	LLCtrlListInterface *	mListSearchResults;
 };
 
 extern LLFloaterWorldMap* gFloaterWorldMap;
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 7581fa91c5..bdb7262416 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -369,16 +369,6 @@ void LLFolderView::closeAllFolders()
 	arrangeAll();
 }
 
-void LLFolderView::openFolder(const std::string& foldername)
-{
-	LLFolderViewFolder* inv = findChild<LLFolderViewFolder>(foldername);
-	if (inv)
-	{
-		setSelection(inv, FALSE, FALSE);
-		inv->setOpen(TRUE);
-	}
-}
-
 void LLFolderView::openTopLevelFolders()
 {
 	for (folders_t::iterator iter = mFolders.begin();
@@ -720,8 +710,10 @@ void LLFolderView::extendSelection(LLFolderViewItem* selection, LLFolderViewItem
 	mSignalSelectCallback = SIGNAL_KEYBOARD_FOCUS;
 }
 
+static LLFastTimer::DeclareTimer FTM_SANITIZE_SELECTION("Sanitize Selection");
 void LLFolderView::sanitizeSelection()
 {
+	LLFastTimer _(FTM_SANITIZE_SELECTION);
 	// store off current item in case it is automatically deselected
 	// and we want to preserve context
 	LLFolderViewItem* original_selected_item = getCurSelectedItem();
@@ -1926,8 +1918,8 @@ BOOL LLFolderView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 		}
 		else
 		{
-		handled = mFolders.front()->handleDragAndDropFromChild(mask,drop,cargo_type,cargo_data,accept,tooltip_msg);
-	}
+			handled = mFolders.front()->handleDragAndDropFromChild(mask,drop,cargo_type,cargo_data,accept,tooltip_msg);
+		}
 	}
 
 	if (handled)
@@ -2048,8 +2040,10 @@ void LLFolderView::removeItemID(const LLUUID& id)
 	mItemMap.erase(id);
 }
 
+LLFastTimer::DeclareTimer FTM_GET_ITEM_BY_ID("Get FolderViewItem by ID");
 LLFolderViewItem* LLFolderView::getItemByID(const LLUUID& id)
 {
+	LLFastTimer _(FTM_GET_ITEM_BY_ID);
 	if (id == getListener()->getUUID())
 	{
 		return this;
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h
index 0b92548fd0..705a76a7b4 100644
--- a/indra/newview/llfolderview.h
+++ b/indra/newview/llfolderview.h
@@ -108,7 +108,6 @@ public:
 
 	// Close all folders in the view
 	void closeAllFolders();
-	void openFolder(const std::string& foldername);
 	void openTopLevelFolders();
 
 	virtual void toggleOpen() {};
diff --git a/indra/newview/llfolderviewitem.h b/indra/newview/llfolderviewitem.h
index f70e63ecdf..dac0c3032c 100644
--- a/indra/newview/llfolderviewitem.h
+++ b/indra/newview/llfolderviewitem.h
@@ -328,6 +328,8 @@ public:
 	virtual BOOL handleMouseUp( S32 x, S32 y, MASK mask );
 	virtual BOOL handleDoubleClick( S32 x, S32 y, MASK mask );
 
+	virtual LLView* findChildView(const std::string& name, BOOL recurse) const { return NULL; }
+
 	//	virtual void handleDropped();
 	virtual void draw();
 	virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index d5d40ca65d..1aa402802e 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -812,9 +812,7 @@ void LLInventoryPanel::openStartFolderOrMyInventory()
 			&& fchild->getListener()
 				&& fchild->getListener()->getUUID() == gInventory.getRootFolderID())
 		{
-			const std::string& child_name = child->getName();
-			mFolderRoot->openFolder(child_name);
-			mFolderRoot->clearSelection();	// No need to keep it selected though!
+			fchild->setOpen(TRUE);
 			break;
 		}
 	}
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp
index 00de6a86e1..b20f89aa7c 100644
--- a/indra/newview/lllogininstance.cpp
+++ b/indra/newview/lllogininstance.cpp
@@ -568,6 +568,7 @@ void LLLoginInstance::constructAuthParams(LLPointer<LLCredential> user_credentia
 	else
 	{
 		requested_options.append("basic-mode");
+		requested_options.append("inventory-basic");
 	}
 
 #endif
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index fd66d7c515..bd18da2251 100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -1701,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);
 		}
 	}
 
@@ -2154,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);
@@ -2169,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;
@@ -2181,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;
@@ -2194,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;
@@ -2445,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
@@ -2453,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
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 27f341b4f6..bef809f3a7 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -154,10 +154,6 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 	}
 	updateLocationCombo(false);
 
-	LLUICtrl& mode_combo = getChildRef<LLUICtrl>("mode_combo");
-	mode_combo.setValue(gSavedSettings.getString("SessionSettingsFile"));
-	mode_combo.setCommitCallback(boost::bind(&LLPanelLogin::onModeChange, this, getChild<LLUICtrl>("mode_combo")->getValue(), _2));
-
 	LLComboBox* server_choice_combo = sInstance->getChild<LLComboBox>("server_combo");
 	server_choice_combo->setCommitCallback(onSelectServer, NULL);
 	server_choice_combo->setFocusLostCallback(boost::bind(onServerComboLostFocus, _1));
@@ -1025,32 +1021,6 @@ void LLPanelLogin::updateLoginPanelLinks()
 	sInstance->getChildView("forgot_password_text")->setVisible( system_grid);
 }
 
-void LLPanelLogin::onModeChange(const LLSD& original_value, const LLSD& new_value)
-{
-	if (original_value.asString() != new_value.asString())
-	{
-		LLNotificationsUtil::add("ModeChange", LLSD(), LLSD(), boost::bind(&LLPanelLogin::onModeChangeConfirm, this, original_value, new_value, _1, _2));
-	}
-}
-
-void LLPanelLogin::onModeChangeConfirm(const LLSD& original_value, const LLSD& new_value, const LLSD& notification, const LLSD& response)
-{
-	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
-	switch (option)
-	{
-	case 0:
-		gSavedSettings.getControl("SessionSettingsFile")->set(new_value);
-		LLAppViewer::instance()->forceQuit();
-		break;
-	case 1:
-		// revert to original value
-		getChild<LLUICtrl>("mode_combo")->setValue(original_value);
-		break;
-	default:
-		break;
-	}
-}
-
 std::string canonicalize_username(const std::string& name)
 {
 	std::string cname = name;
diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h
index 11273453ba..b29b3af7ca 100644
--- a/indra/newview/llpanellogin.h
+++ b/indra/newview/llpanellogin.h
@@ -97,8 +97,6 @@ private:
 	static void onServerComboLostFocus(LLFocusableElement*);
 	static void updateServerCombo();
 	static void updateStartSLURL();
-	void onModeChange(const LLSD& original_value, const LLSD& new_value);
-	void onModeChangeConfirm(const LLSD& original_value, const LLSD& new_value, const LLSD& notification, const LLSD& response);
 	
 	static void updateLoginPanelLinks();
 
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 1920cc2940..858f5cf575 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -572,28 +572,16 @@ void LLPanelMainInventory::updateItemcountText()
 	{
 		text = getString("ItemcountUnknown");
 	}
+	
+	// *TODO: Cache the LLUICtrl* for the ItemcountText control
 	getChild<LLUICtrl>("ItemcountText")->setValue(text);
 }
 
 void LLPanelMainInventory::onFocusReceived()
 {
 	LLSidepanelInventory * sidepanel_inventory = LLSideTray::getInstance()->getPanel<LLSidepanelInventory>("sidepanel_inventory");
-
-	LLInventoryPanel * inbox_panel = sidepanel_inventory->findChild<LLInventoryPanel>("inventory_inbox");
-
-	if (inbox_panel)
-	{
-		inbox_panel->clearSelection();
-	}
-
-	LLInventoryPanel * outbox_panel = sidepanel_inventory->findChild<LLInventoryPanel>("inventory_outbox");
-
-	if (outbox_panel)
-	{
-		outbox_panel->clearSelection();
-	}
-
-	sidepanel_inventory->updateVerbs();
+	
+	sidepanel_inventory->clearSelections(false, true, true);
 }
 
 void LLPanelMainInventory::setFilterTextFromFilter() 
diff --git a/indra/newview/llpanelmarketplaceinbox.cpp b/indra/newview/llpanelmarketplaceinbox.cpp
index 069a46604d..f17f36a977 100644
--- a/indra/newview/llpanelmarketplaceinbox.cpp
+++ b/indra/newview/llpanelmarketplaceinbox.cpp
@@ -83,7 +83,7 @@ void LLPanelMarketplaceInbox::handleLoginComplete()
 	LLSideTray::getInstance()->setTabButtonBadgeDriver("sidebar_inventory", this);
 }
 
-void LLPanelMarketplaceInbox::setupInventoryPanel()
+LLInventoryPanel * LLPanelMarketplaceInbox::setupInventoryPanel()
 {
 	LLView * inbox_inventory_placeholder = getChild<LLView>("inbox_inventory_placeholder");
 	LLView * inbox_inventory_parent = inbox_inventory_placeholder->getParent();
@@ -106,30 +106,15 @@ void LLPanelMarketplaceInbox::setupInventoryPanel()
 	
 	// Hide the placeholder text
 	inbox_inventory_placeholder->setVisible(FALSE);
+	
+	return mInventoryPanel;
 }
 
 void LLPanelMarketplaceInbox::onFocusReceived()
 {
 	LLSidepanelInventory * sidepanel_inventory = LLSideTray::getInstance()->getPanel<LLSidepanelInventory>("sidepanel_inventory");
 
-	if (sidepanel_inventory)
-	{
-		LLInventoryPanel * inv_panel = sidepanel_inventory->getActivePanel();
-
-		if (inv_panel)
-		{
-			inv_panel->clearSelection();
-		}
-	
-		LLInventoryPanel * outbox_panel = sidepanel_inventory->findChild<LLInventoryPanel>("inventory_outbox");
-
-		if (outbox_panel)
-		{
-			outbox_panel->clearSelection();
-		}
-		
-		sidepanel_inventory->updateVerbs();
-	}
+	sidepanel_inventory->clearSelections(true, false, true);
 }
 
 BOOL LLPanelMarketplaceInbox::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg)
diff --git a/indra/newview/llpanelmarketplaceinbox.h b/indra/newview/llpanelmarketplaceinbox.h
index 4ecea29304..7b4ed137db 100644
--- a/indra/newview/llpanelmarketplaceinbox.h
+++ b/indra/newview/llpanelmarketplaceinbox.h
@@ -55,7 +55,7 @@ public:
 
 	/*virtual*/ void draw();
 	
-	void setupInventoryPanel();
+	LLInventoryPanel * setupInventoryPanel();
 
 	U32 getFreshItemCount() const;
 	U32 getTotalItemCount() const;
diff --git a/indra/newview/llpanelmarketplaceoutbox.cpp b/indra/newview/llpanelmarketplaceoutbox.cpp
index 74d0de3b30..d51a0d78fe 100644
--- a/indra/newview/llpanelmarketplaceoutbox.cpp
+++ b/indra/newview/llpanelmarketplaceoutbox.cpp
@@ -83,25 +83,8 @@ void LLPanelMarketplaceOutbox::handleLoginComplete()
 void LLPanelMarketplaceOutbox::onFocusReceived()
 {
 	LLSidepanelInventory * sidepanel_inventory = LLSideTray::getInstance()->getPanel<LLSidepanelInventory>("sidepanel_inventory");
-
-	if (sidepanel_inventory)
-	{
-		LLInventoryPanel * inv_panel = sidepanel_inventory->getActivePanel();
-
-		if (inv_panel)
-		{
-			inv_panel->clearSelection();
-		}
-
-		LLInventoryPanel * inbox_panel = sidepanel_inventory->findChild<LLInventoryPanel>("inventory_inbox");
-
-		if (inbox_panel)
-		{
-			inbox_panel->clearSelection();
-		}
-		
-		sidepanel_inventory->updateVerbs();
-	}
+	
+	sidepanel_inventory->clearSelections(true, true, false);
 }
 
 void LLPanelMarketplaceOutbox::onSelectionChange()
@@ -111,7 +94,7 @@ void LLPanelMarketplaceOutbox::onSelectionChange()
 	sidepanel_inventory->updateVerbs();
 }
 
-void LLPanelMarketplaceOutbox::setupInventoryPanel()
+LLInventoryPanel * LLPanelMarketplaceOutbox::setupInventoryPanel()
 {
 	LLView * outbox_inventory_placeholder = getChild<LLView>("outbox_inventory_placeholder");
 	LLView * outbox_inventory_parent = outbox_inventory_placeholder->getParent();
@@ -134,6 +117,8 @@ void LLPanelMarketplaceOutbox::setupInventoryPanel()
 	
 	// Hide the placeholder text
 	outbox_inventory_placeholder->setVisible(FALSE);
+	
+	return mInventoryPanel;
 }
 
 bool LLPanelMarketplaceOutbox::isOutboxEmpty() const
diff --git a/indra/newview/llpanelmarketplaceoutbox.h b/indra/newview/llpanelmarketplaceoutbox.h
index 1b502127ef..8e2c35914d 100644
--- a/indra/newview/llpanelmarketplaceoutbox.h
+++ b/indra/newview/llpanelmarketplaceoutbox.h
@@ -54,7 +54,7 @@ public:
 
 	/*virtual*/ BOOL postBuild();
 
-	void setupInventoryPanel();
+	LLInventoryPanel * setupInventoryPanel();
 
 	bool isOutboxEmpty() const;
 	bool isSyncInProgress() const;
diff --git a/indra/newview/llsecapi.h b/indra/newview/llsecapi.h
index b65cf37e7f..8e4c2c56c6 100644
--- a/indra/newview/llsecapi.h
+++ b/indra/newview/llsecapi.h
@@ -160,7 +160,7 @@ public:
 // base class for a list of certificates.
 
 
-class LLCertificateVector : public LLRefCount
+class LLCertificateVector : public LLThreadSafeRefCount
 {
 	
 public:
diff --git a/indra/newview/llsechandler_basic.cpp b/indra/newview/llsechandler_basic.cpp
index 90e8ff0aae..904bb03270 100644
--- a/indra/newview/llsechandler_basic.cpp
+++ b/indra/newview/llsechandler_basic.cpp
@@ -1209,12 +1209,12 @@ void LLSecAPIBasicHandler::init()
 		// with the product
 		std::string ca_file_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "CA.pem");
 		llinfos << "app path " << ca_file_path << llendl;
-		LLBasicCertificateStore app_ca_store = LLBasicCertificateStore(ca_file_path);	
+		LLPointer<LLBasicCertificateStore> app_ca_store = new LLBasicCertificateStore(ca_file_path);
 		
 		// push the applicate CA files into the store, therefore adding any new CA certs that 
 		// updated
-		for(LLCertificateVector::iterator i = app_ca_store.begin();
-			i != app_ca_store.end();
+		for(LLCertificateVector::iterator i = app_ca_store->begin();
+			i != app_ca_store->end();
 			i++)
 		{
 			mStore->add(*i);
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
index 6f809ba3ca..a800611aac 100644
--- a/indra/newview/llsidepanelinventory.cpp
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -132,6 +132,8 @@ private:
 LLSidepanelInventory::LLSidepanelInventory()
 	: LLPanel()
 	, mItemPanel(NULL)
+	, mInventoryPanelInbox(NULL)
+	, mInventoryPanelOutbox(NULL)
 	, mPanelMainInventory(NULL)
 	, mInboxEnabled(false)
 	, mOutboxEnabled(false)
@@ -351,7 +353,7 @@ void LLSidepanelInventory::observeInboxModifications(const LLUUID& inboxID)
 	//
 	
 	LLPanelMarketplaceInbox * inbox = getChild<LLPanelMarketplaceInbox>(MARKETPLACE_INBOX_PANEL);
-	inbox->setupInventoryPanel();
+	mInventoryPanelInbox = inbox->setupInventoryPanel();
 }
 
 
@@ -380,7 +382,7 @@ void LLSidepanelInventory::observeOutboxModifications(const LLUUID& outboxID)
 	//
 	
 	LLPanelMarketplaceOutbox * outbox = getChild<LLPanelMarketplaceOutbox>(MARKETPLACE_OUTBOX_PANEL);
-	outbox->setupInventoryPanel();
+	mInventoryPanelOutbox = outbox->setupInventoryPanel();
 }
 
 void LLSidepanelInventory::enableInbox(bool enabled)
@@ -529,14 +531,12 @@ void LLSidepanelInventory::onShopButtonClicked()
 
 void LLSidepanelInventory::performActionOnSelection(const std::string &action)
 {
-	LLPanelMainInventory *panel_main_inventory = mInventoryPanel->getChild<LLPanelMainInventory>("panel_main_inventory");
-	LLFolderViewItem* current_item = panel_main_inventory->getActivePanel()->getRootFolder()->getCurSelectedItem();
+	LLFolderViewItem* current_item = mPanelMainInventory->getActivePanel()->getRootFolder()->getCurSelectedItem();
 	if (!current_item)
 	{
-		LLInventoryPanel* inbox = findChild<LLInventoryPanel>("inventory_inbox");
-		if (inbox)
+		if (mInventoryPanelInbox)
 		{
-			current_item = inbox->getRootFolder()->getCurSelectedItem();
+			current_item = mInventoryPanelInbox->getRootFolder()->getCurSelectedItem();
 		}
 
 		if (!current_item)
@@ -545,7 +545,7 @@ void LLSidepanelInventory::performActionOnSelection(const std::string &action)
 		}
 	}
 
-	current_item->getListener()->performAction(panel_main_inventory->getActivePanel()->getModel(), action);
+	current_item->getListener()->performAction(mPanelMainInventory->getActivePanel()->getModel(), action);
 }
 
 void LLSidepanelInventory::onWearButtonClicked()
@@ -687,19 +687,16 @@ void LLSidepanelInventory::updateVerbs()
 
 bool LLSidepanelInventory::canShare()
 {
-	LLPanelMainInventory* panel_main_inventory =
-		mInventoryPanel->findChild<LLPanelMainInventory>("panel_main_inventory");
-
-	LLInventoryPanel* inbox = findChild<LLInventoryPanel>("inventory_inbox");
+	LLInventoryPanel* inbox = mInventoryPanelInbox;
 
 	// Avoid flicker in the Recent tab while inventory is being loaded.
 	if ( (!inbox || inbox->getRootFolder()->getSelectionList().empty())
-		&& (panel_main_inventory && !panel_main_inventory->getActivePanel()->getRootFolder()->hasVisibleChildren()) )
+		&& (mPanelMainInventory && !mPanelMainInventory->getActivePanel()->getRootFolder()->hasVisibleChildren()) )
 	{
 		return false;
 	}
 
-	return ( (panel_main_inventory ? LLAvatarActions::canShareSelectedItems(panel_main_inventory->getActivePanel()) : false)
+	return ( (mPanelMainInventory ? LLAvatarActions::canShareSelectedItems(mPanelMainInventory->getActivePanel()) : false)
 			|| (inbox ? LLAvatarActions::canShareSelectedItems(inbox) : false) );
 }
 
@@ -724,14 +721,13 @@ bool LLSidepanelInventory::canWearSelected()
 
 LLInventoryItem *LLSidepanelInventory::getSelectedItem()
 {
-	LLPanelMainInventory *panel_main_inventory = mInventoryPanel->getChild<LLPanelMainInventory>("panel_main_inventory");
-	LLFolderViewItem* current_item = panel_main_inventory->getActivePanel()->getRootFolder()->getCurSelectedItem();
+	LLFolderViewItem* current_item = mPanelMainInventory->getActivePanel()->getRootFolder()->getCurSelectedItem();
+	
 	if (!current_item)
 	{
-		LLInventoryPanel* inbox = findChild<LLInventoryPanel>("inventory_inbox");
-		if (inbox)
+		if (mInventoryPanelInbox)
 		{
-			current_item = inbox->getRootFolder()->getCurSelectedItem();
+			current_item = mInventoryPanelInbox->getRootFolder()->getCurSelectedItem();
 		}
 
 		if (!current_item)
@@ -748,14 +744,20 @@ U32 LLSidepanelInventory::getSelectedCount()
 {
 	int count = 0;
 
-	LLPanelMainInventory *panel_main_inventory = mInventoryPanel->getChild<LLPanelMainInventory>("panel_main_inventory");
-	std::set<LLUUID> selection_list = panel_main_inventory->getActivePanel()->getRootFolder()->getSelectionList();
+	std::set<LLUUID> selection_list = mPanelMainInventory->getActivePanel()->getRootFolder()->getSelectionList();
 	count += selection_list.size();
 
-	LLInventoryPanel* inbox = findChild<LLInventoryPanel>("inventory_inbox");
-	if (inbox)
+	if ((count == 0) && mInboxEnabled && (mInventoryPanelInbox != NULL))
 	{
-		selection_list = inbox->getRootFolder()->getSelectionList();
+		selection_list = mInventoryPanelInbox->getRootFolder()->getSelectionList();
+
+	count += selection_list.size();
+	}
+
+	if ((count == 0) && mOutboxEnabled && (mInventoryPanelOutbox != NULL))
+	{
+		selection_list = mInventoryPanelOutbox->getRootFolder()->getSelectionList();
+		
 		count += selection_list.size();
 	}
 
@@ -779,3 +781,45 @@ BOOL LLSidepanelInventory::isMainInventoryPanelActive() const
 {
 	return mInventoryPanel->getVisible();
 }
+
+void LLSidepanelInventory::clearSelections(bool clearMain, bool clearInbox, bool clearOutbox)
+{
+	if (clearMain)
+	{
+		LLInventoryPanel * inv_panel = getActivePanel();
+		
+		if (inv_panel)
+		{
+			inv_panel->clearSelection();
+		}
+	}
+	
+	if (clearInbox && mInboxEnabled && (mInventoryPanelInbox != NULL))
+	{
+		mInventoryPanelInbox->clearSelection();
+	}
+	
+	if (clearOutbox && mOutboxEnabled && (mInventoryPanelOutbox != NULL))
+	{
+		mInventoryPanelOutbox->clearSelection();
+	}
+	
+	updateVerbs();
+}
+
+std::set<LLUUID> LLSidepanelInventory::getInboxOrOutboxSelectionList()
+{
+	std::set<LLUUID> inventory_selected_uuids;
+	
+	if (mInboxEnabled && (mInventoryPanelInbox != NULL))
+	{
+		inventory_selected_uuids = mInventoryPanelInbox->getRootFolder()->getSelectionList();
+	}
+	
+	if (inventory_selected_uuids.empty() && mOutboxEnabled && (mInventoryPanelOutbox != NULL))
+	{
+		inventory_selected_uuids = mInventoryPanelOutbox->getRootFolder()->getSelectionList();
+	}
+	
+	return inventory_selected_uuids;
+}
diff --git a/indra/newview/llsidepanelinventory.h b/indra/newview/llsidepanelinventory.h
index 9117e3bf27..f80a3a9dd3 100644
--- a/indra/newview/llsidepanelinventory.h
+++ b/indra/newview/llsidepanelinventory.h
@@ -58,6 +58,9 @@ public:
 	LLInventoryPanel* getActivePanel(); // Returns an active inventory panel, if any.
 	LLPanelMainInventory* getMainInventoryPanel() const { return mPanelMainInventory; }
 	BOOL isMainInventoryPanelActive() const;
+	
+	void clearSelections(bool clearMain, bool clearInbox, bool clearOutbox);
+	std::set<LLUUID> getInboxOrOutboxSelectionList();
 
 	void showItemInfoPanel();
 	void showTaskInfoPanel();
@@ -95,6 +98,8 @@ protected:
 	//
 private:
 	LLPanel*					mInventoryPanel; // Main inventory view
+	LLInventoryPanel*			mInventoryPanelInbox;
+	LLInventoryPanel*			mInventoryPanelOutbox;
 	LLSidepanelItemInfo*		mItemPanel; // Individual item view
 	LLSidepanelTaskInfo*		mTaskPanel; // Individual in-world object view
 	LLPanelMainInventory*		mPanelMainInventory;
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index e4bf668275..7991233ace 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -720,7 +720,13 @@ bool idle_startup()
 
 		timeout_count = 0;
 
+		// Login screen needs menus for preferences, but we can enter
+		// this startup phase more than once.
+		if (gLoginMenuBarView == NULL)
+		{
 		initialize_edit_menu();
+			init_menus();
+		}
 
 		if (show_connect_box)
 		{
@@ -755,19 +761,6 @@ bool idle_startup()
 			LLStartUp::setStartupState( STATE_LOGIN_CLEANUP );
 		}
 
-		// *NOTE: This is where LLViewerParcelMgr::getInstance() used to get allocated before becoming LLViewerParcelMgr::getInstance().
-
-		// *NOTE: This is where gHUDManager used to bet allocated before becoming LLHUDManager::getInstance().
-
-		// *NOTE: This is where gMuteList used to get allocated before becoming LLMuteList::getInstance().
-
-		// Login screen needs menus for preferences, but we can enter
-		// this startup phase more than once.
-		if (gLoginMenuBarView == NULL)
-		{
-			init_menus();
-		}
-		
 		gViewerWindow->setNormalControlsVisible( FALSE );	
 		gLoginMenuBarView->setVisible( TRUE );
 		gLoginMenuBarView->setEnabled( TRUE );
@@ -1562,6 +1555,12 @@ bool idle_startup()
  			}
  		}
 
+		LLSD inv_basic = response["inventory-basic"];
+ 		if(inv_basic.isDefined())
+ 		{
+			llinfos << "Basic inventory root folder id is " << inv_basic["folder_id"] << llendl;
+ 		}
+
 		LLSD buddy_list = response["buddy-list"];
  		if(buddy_list.isDefined())
  		{
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index f6499e12de..b29821479b 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -832,7 +832,8 @@ U32 feature_from_string(std::string feature)
 };
 
 
-class LLAdvancedToggleFeature : public view_listener_t{
+class LLAdvancedToggleFeature : public view_listener_t
+{
 	bool handleEvent(const LLSD& userdata)
 	{
 		U32 feature = feature_from_string( userdata.asString() );
@@ -845,7 +846,8 @@ class LLAdvancedToggleFeature : public view_listener_t{
 };
 
 class LLAdvancedCheckFeature : public view_listener_t
-{bool handleEvent(const LLSD& userdata)
+{
+	bool handleEvent(const LLSD& userdata)
 {
 	U32 feature = feature_from_string( userdata.asString() );
 	bool new_value = false;
@@ -7777,6 +7779,55 @@ class LLToggleUIHints : public view_listener_t
 	}
 };
 
+class LLCheckSessionsSettings : public view_listener_t
+{
+	bool handleEvent(const LLSD& userdata)
+	{
+		std::string expected = userdata.asString();
+		return gSavedSettings.getString("SessionSettingsFile") == expected;
+	}
+};
+
+class LLChangeMode : public view_listener_t
+{
+	bool handleEvent(const LLSD& userdata)
+	{
+		std::string mode = userdata.asString();
+		if (mode == "basic")
+		{
+			if (gSavedSettings.getString("SessionSettingsFile") != "settings_minimal.xml")
+			{
+				LLNotificationsUtil::add("ModeChange", LLSD(), LLSD(), boost::bind(onModeChangeConfirm, "settings_minimal.xml", _1, _2));
+			}
+			return true;
+		}
+		else if (mode == "advanced")
+		{
+			if (gSavedSettings.getString("SessionSettingsFile") != "")
+			{
+				LLNotificationsUtil::add("ModeChange", LLSD(), LLSD(), boost::bind(onModeChangeConfirm, "", _1, _2));
+			}
+			return true;
+		}
+		return false;
+	}	
+	
+	static void onModeChangeConfirm(const std::string& new_session_settings_file, const LLSD& notification, const LLSD& response)
+	{
+		S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
+		switch (option)
+		{
+		case 0:
+			gSavedSettings.getControl("SessionSettingsFile")->set(new_session_settings_file);
+			LLAppViewer::instance()->requestQuit();
+			break;
+		case 1:
+		default:
+			break;
+		}
+	}
+};
+
 void LLUploadCostCalculator::calculateCost()
 {
 	S32 upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
@@ -8266,6 +8317,8 @@ void initialize_menus()
 	view_listener_t::addMenu(new LLEditableSelectedMono(), "EditableSelectedMono");
 
 	view_listener_t::addMenu(new LLToggleUIHints(), "ToggleUIHints");
+	view_listener_t::addMenu(new LLCheckSessionsSettings(), "CheckSessionSettings");
+	view_listener_t::addMenu(new LLChangeMode(), "ChangeMode");
 
 	commit.add("Destination.show", boost::bind(&toggle_destination_and_avatar_picker, 0));
 	commit.add("Avatar.show", boost::bind(&toggle_destination_and_avatar_picker, 1));
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 373b7f372b..959bce63b1 100755
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -369,6 +369,7 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys,
 		//

 		// Unpack texture entry data

 		//

+

 		S32 result = unpackTEMessage(mesgsys, _PREHASH_ObjectData, block_num);

 		if (result & teDirtyBits)

 		{

@@ -974,12 +975,8 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams &params_in, const S32 detail, bo
 		// 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)

 			{

@@ -1035,14 +1032,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();

@@ -3277,7 +3273,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);

 		}

@@ -4119,7 +4115,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/skins/default/xui/de/floater_build_options.xml b/indra/newview/skins/default/xui/de/floater_build_options.xml
index e90eb2c00b..939fd5dee4 100644
--- a/indra/newview/skins/default/xui/de/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/de/floater_build_options.xml
@@ -1,7 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="RASTER-OPTIONEN">
-	<spinner label="Raster-Einheiten (Meter)" name="GridResolution"/>
-	<spinner label="Rastergröße (Meter)" name="GridDrawSize"/>
+	<floater.string name="grid_screen_text">
+		Bildschirm
+	</floater.string>
+	<floater.string name="grid_local_text">
+		Lokal
+	</floater.string>
+	<floater.string name="grid_world_text">
+		Welt
+	</floater.string>
+	<floater.string name="grid_reference_text">
+		Referenz
+	</floater.string>
+	<floater.string name="grid_attachment_text">
+		Anhang
+	</floater.string>
+	<text name="grid_mode_label" tool_tip="Rasteropazität">
+		Modus
+	</text>
+	<combo_box name="combobox grid mode" tool_tip="Wählen Sie das gewünschte Rasterlineal zum Positionieren des Objekts aus.">
+		<combo_box.item label="Globales Raster" name="World"/>
+		<combo_box.item label="Lokales Raster" name="Local"/>
+		<combo_box.item label="Referenzraster" name="Reference"/>
+	</combo_box>
+	<spinner label="Einheiten (m)" name="GridResolution"/>
+	<spinner label="Rastergröße (meter)" name="GridDrawSize"/>
 	<check_box label="An Untereinheiten ausrichten" name="GridSubUnit"/>
 	<check_box label="Überschneidungen anzeigen" name="GridCrossSection"/>
 	<text name="grid_opacity_label" tool_tip="Raster-Deckkraft">
diff --git a/indra/newview/skins/default/xui/de/floater_model_preview.xml b/indra/newview/skins/default/xui/de/floater_model_preview.xml
index 24e2788e0b..330893c326 100644
--- a/indra/newview/skins/default/xui/de/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_model_preview.xml
@@ -60,6 +60,9 @@
 	<string name="simplifying">
 		Vereinfachung läuft...
 	</string>
+	<string name="tbd">
+		noch nicht festgelegt
+	</string>
 	<text name="name_label">
 		Name:
 	</text>
@@ -80,23 +83,26 @@
 			Detailstufe: Niedrigste
 		</combo_item>
 	</combo_box>
-	<panel>
-		<text name="streaming cost">
-			Ressourcenkosten: [COST]
-		</text>
-		<text name="physics cost">
-			Physikkosten: [COST]
-		</text>
-		<text name="upload fee">
-			Gebühr für Hochladen: --
-		</text>
-	</panel>
-	<text name="status">
-		[STATUS]
+	<text name="warning_title">
+		ACHTUNG:
+	</text>
+	<text name="warning_message">
+		Sie können dieses Modell nicht auf die Second Life-Server hochladen. [[VURL] Weitere Infos], wie Sie das Hochladen von Netzmodellen freischalten können.
+	</text>
+	<text name="weights_text">
+		Herunterladen:
+Physik:
+Server:
+
+Prim-Äquivalenz:
+	</text>
+	<text name="weights">
+		[ST]
+[PH]
+[SIM]
+
+[EQ]
 	</text>
-	<button label="Standardwerte" name="reset_btn" tool_tip="Standardwerte wiederherstellen"/>
-	<button label="Hochladen" name="ok_btn" tool_tip="An Simulator hochladen"/>
-	<button label="Abbrechen" name="cancel_btn"/>
 	<tab_container name="import_tab">
 		<panel label="Detailstufe" name="lod_panel">
 			<text name="lod_table_header">
@@ -234,4 +240,11 @@
 			<spinner name="pelvis_offset" value="0,0"/>
 		</panel>
 	</tab_container>
+	<text name="upload_fee">
+		Gebühr für Hochladen: [FEE] L$
+	</text>
+	<button label="Auf Standardwerte setzen" name="reset_btn" tool_tip="Auf Standardwerte setzen"/>
+	<button label="Gewichte und Gebühr berechnen" name="calculate_btn" tool_tip="Gewichte und Gebühr berechnen"/>
+	<button label="Hochladen" name="ok_btn" tool_tip="An Simulator hochladen"/>
+	<button label="Abbrechen" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_model_wizard.xml b/indra/newview/skins/default/xui/de/floater_model_wizard.xml
index 618b60e0ec..7103757b40 100644
--- a/indra/newview/skins/default/xui/de/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/de/floater_model_wizard.xml
@@ -2,42 +2,54 @@
 <floater name="Model Wizard" title="ASSISTENT ZUM HOCHLADEN VON MODELLEN">
 	<button label="5. Hochladen" name="upload_btn"/>
 	<button label="4. Überprüfen" name="review_btn"/>
-	<button label="3. Physik" name="physics2_btn"/>
 	<button label="3. Physik" name="physics_btn"/>
 	<button label="2. Optimieren" name="optimize_btn"/>
 	<button label="1. Datei auswählen" name="choose_file_btn"/>
 	<panel name="choose_file_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Modell hochladen
+		<panel name="choose_file_header_panel">
+			<text name="choose_file_header_text">
+				Modelldatei auswählen
 			</text>
 		</panel>
-		<text name="description">
-			Mit diesem Assistenten können Sie Netzmodelle in Second Life hochladen.  Geben Sie zuerst die Datei mit dem zu importierenden Modell an.  Second Life unterstützt COLLADA-Dateien (.dae).
-		</text>
-		<panel name="content">
-			<text name="Cache location">
-				Dateiname:
+		<panel name="choose_file_content_panel">
+			<text name="advanced_users_text">
+				Fortgeschrittene Benutzer: Wenn Sie bereits mit Tools zur Erstellung von 3D-Inhalten vertraut sind, können Sie den erweiterten Uploader verwenden.
+			</text>
+			<button label="Auf Erweitert wechseln" name="switch_to_advanced"/>
+			<text name="choose_model_file_label">
+				Hochzuladende Modelldatei auswählen
 			</text>
 			<button label="Durchsuchen..." label_selected="Durchsuchen..." name="browse"/>
+			<text name="support_collada_text">
+				Second Life unterstützt COLLADA-Dateien (.dae).
+			</text>
+			<text name="dimensions_label">
+				Abmessungen (m):
+			</text>
 			<text name="dimensions">
-				X:         Y:         Z:
+				X         Y         Z
+			</text>
+			<text name="warning_label">
+				ACHTUNG:
 			</text>
-			<text name="dimension_dividers">
-				|               |
+			<text name="warning_text">
+				Sie können den letzten Schritt nicht abschließen (Modell auf Second Life-Server hochladen). [secondlife:///app/floater/learn_more Weitere Infos], wie Sie Ihr Konto zum Hochladen von Netzmodellen einrichten.
 			</text>
 		</panel>
 	</panel>
 	<panel name="optimize_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Optimieren
+		<panel name="optimize_header_panel">
+			<text name="optimize_header_text">
+				Modell optimieren
 			</text>
 		</panel>
-		<text name="description">
-			Dieser Assistent hat Ihr Modell optimiert, um die Leistung zu erhöhen. Sie können die Optimierungsergebnisse unten ändern oder zum Fortfahren auf „Weiter“ klicken.
+		<text name="optimize_hint">
+			Wir haben das Modell auf Leistung optimiert. Sie können es bei Bedarf weiter anpassen.
 		</text>
-		<panel name="content">
+		<panel name="optimize_content_panel">
+			<text name="generating_lod_label">
+				Detailstufe generieren
+			</text>
 			<text name="high_detail_text">
 				Detailstufe generieren: Hoch
 			</text>
@@ -52,140 +64,154 @@
 			</text>
 		</panel>
 		<panel name="content2">
-			<text name="lod_label">
-				Modellvorschau:
+			<text name="optimize_performance_text">
+				Leistung
 			</text>
-			<combo_box name="preview_lod_combo2" tool_tip="Detailstufe zur Anzeige in Vorschaudarstellung">
-				<combo_item name="high">
-					Hoch
+			<text name="optimize_faster_rendering_text">
+				Schnellere Darstellung
+Weniger Details
+Niedrigeres Prim-Gewicht
+			</text>
+			<text name="optimize_accuracy_text">
+				Genauigkeit
+			</text>
+			<text name="optimize_slower_rendering_text">
+				Langsamere Darstellung
+Mehr Details
+Höheres Prim-Gewicht
+			</text>
+			<text name="accuracy_slider_mark1">
+				&apos;
+			</text>
+			<text name="accuracy_slider_mark2">
+				&apos;
+			</text>
+			<text name="accuracy_slider_mark3">
+				&apos;
+			</text>
+			<button label="Geometrie neu berechnen" name="recalculate_geometry_btn"/>
+			<text name="geometry_preview_label">
+				Geometrievorschau
+			</text>
+			<combo_box name="preview_lod_combo" tool_tip="Detailstufe zur Anzeige in Vorschaudarstellung">
+				<combo_item name="preview_lod_high">
+					Viel Details
 				</combo_item>
-				<combo_item name="medium">
-					Mittel
+				<combo_item name="preview_lod_medium">
+					Mittlere Details
 				</combo_item>
-				<combo_item name="low">
-					Niedrig
+				<combo_item name="preview_lod_low">
+					Wenig Details
 				</combo_item>
-				<combo_item name="lowest">
-					Niedrigste
+				<combo_item name="preview_lod_lowest">
+					Wenigste Details
 				</combo_item>
 			</combo_box>
-			<text name="streaming cost">
-				Ressourcenkosten:    [COST]
-			</text>
-			<text name="dimensions">
-				X:         Y:         Z:
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
 		</panel>
 	</panel>
 	<panel name="physics_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Physik
+		<panel name="physics_header_panel">
+			<text name="physics_header_text">
+				Physik anpassen
 			</text>
 		</panel>
-		<text name="description">
-			Der Assistent erstellt eine physische Form, die die Interaktionen des Objekts mit anderen Objekten und Avataren bestimmt. Setzen Sie den Schieber auf die Detailstufe, die für Ihr Objekt am besten geeignet ist:
+		<text name="physics_hint">
+			Wir erstellen eine Form für die Außenhülle des Modells. Passen Sie die Detailstufe der Form wie für den beabsichtigten Zweck erforderlich an.
 		</text>
-		<panel name="content">
-			<text name="streaming cost">
-				Ressourcenkosten:       [COST]
+		<panel name="physics_content_panel">
+			<text name="physics_performance_text">
+				Leistung
 			</text>
-		</panel>
-	</panel>
-	<panel name="physics2_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Physik
+			<text name="physics_faster_rendering_text">
+				Schnellere Darstellung
+Weniger Details
+Niedrigeres Prim-Gewicht
 			</text>
-		</panel>
-		<text name="description">
-			Überprüfen Sie die physische Form unten und klicken Sie dann auf „Weiter“.  Um die physische Form zu ändern, klicken Sie auf „Zurück“.
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				Modellvorschau:
+			<text name="physics_accuracy_text">
+				Genauigkeit
 			</text>
-			<combo_box name="preview_lod_combo3" tool_tip="Detailstufe zur Anzeige in Vorschaudarstellung">
-				<combo_item name="high">
-					Hoch
+			<text name="physics_slower_dendering_text">
+				Langsamere Darstellung
+Mehr Details
+Höheres Prim-Gewicht
+			</text>
+			<text name="physics_example_1">
+				Beispiele:
+Mobile Objekte
+Fliegende Objekte
+Fahrzeuge
+			</text>
+			<text name="physics_example_2">
+				Beispiele:
+Kleine statische Objekte
+Objekte mit weniger Details
+Einfache Möbel
+			</text>
+			<text name="physics_example_3">
+				Beispiele:
+Statische Objekte
+Objekte mit viel Details
+Gebäude
+			</text>
+			<button label="Physik neu berechnen" name="recalculate_physics_btn"/>
+			<button label="Neu berechnen..." name="recalculating_physics_btn"/>
+			<text name="physics_preview_label">
+				Physikvorschau
+			</text>
+			<combo_box name="preview_lod_combo2" tool_tip="Detailstufe zur Anzeige in Vorschaudarstellung">
+				<combo_item name="preview_lod2_high">
+					Viel Details
 				</combo_item>
-				<combo_item name="medium">
-					Mittel
+				<combo_item name="preview_lod2_medium">
+					Mittlere Details
 				</combo_item>
-				<combo_item name="low">
-					Niedrig
+				<combo_item name="preview_lod2_low">
+					Wenig Details
 				</combo_item>
-				<combo_item name="lowest">
-					Niedrigste
+				<combo_item name="preview_lod2_lowest">
+					Wenigste Details
 				</combo_item>
 			</combo_box>
-			<text name="dimensions">
-				X:         Y:         Z:
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
-			<text name="streaming cost">
-				Ressourcenkosten:       [COST]
-			</text>
 		</panel>
 	</panel>
 	<panel name="review_panel">
-		<panel name="header_panel">
-			<text name="header_text">
+		<panel name="review_header_panel">
+			<text name="review_header_text">
 				Überprüfen
 			</text>
 		</panel>
-		<text name="description">
-			Überprüfen Sie die Details unten und klicken Sie dann auf „Hochladen“, um das Modell hochzuladen. Die Kosten werden von Ihrem L$-Kontostand abgezogen.
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				Modellvorschau:
+		<panel name="review_content_panel">
+			<text name="review_prim_equiv">
+				Auswirkung auf Parzelle/Region: Prim-Äquivalenzwert [EQUIV]
 			</text>
-			<combo_box name="preview_lod_combo" tool_tip="Detailstufe zur Anzeige in Vorschaudarstellung">
-				<combo_item name="high">
-					Hoch
-				</combo_item>
-				<combo_item name="medium">
-					Mittel
-				</combo_item>
-				<combo_item name="low">
-					Niedrig
-				</combo_item>
-				<combo_item name="lowest">
-					Niedrigste
-				</combo_item>
-			</combo_box>
-			<text name="dimensions">
-				X:         Y:         Z:
+			<text name="review_fee">
+				Die für das Hochladen anfallende Gebühr in Höhe von [FEE] L$ wird von Ihrem Konto abgebucht.
 			</text>
-			<text name="dimension_dividers">
-				|               |
+			<text name="review_confirmation">
+				Durch Klicken auf „Hochladen“ bestätigen Sie, dass Sie die erforderlichen Rechte für das im Modell enthaltene Material besitzen.
 			</text>
 		</panel>
-		<text name="streaming cost">
-			Ressourcenkosten:         [COST]
-		</text>
-		<text name="physics cost">
-			Physikkosten:        [COST]
-		</text>
 	</panel>
 	<panel name="upload_panel">
-		<panel name="header_panel">
-			<text name="header_text">
+		<panel name="upload_header_panel">
+			<text name="upload_header_text">
 				Upload abgeschlossen
 			</text>
 		</panel>
-		<text name="description">
-			Herzlichen Glückwunsch! Ihr Modell wurde erfolgreich hochgeladen.  Sie finden das Modell im Objektordner Ihres Inventars.
+		<text name="model_uploaded_text">
+			Ihr Modell wurde hochgeladen.
+		</text>
+		<text name="inventory_text">
+			Sie finden das Modell im Objektordner Ihres Inventars.
+		</text>
+		<text name="charged_fee">
+			Von Ihrem Konto wurden [FEE] L$ abgebucht.
 		</text>
 	</panel>
 	<button label="&lt;&lt; Zurück" name="back"/>
 	<button label="Weiter &gt;&gt;" name="next"/>
+	<button label="Gewichte und Gebühr berechnen &gt;&gt;" name="calculate"/>
+	<button label="Berechnen..." name="calculating"/>
 	<button label="Hochladen" name="upload" tool_tip="An Simulator hochladen"/>
 	<button label="Abbrechen" name="cancel"/>
 	<button label="Schließen" name="close"/>
diff --git a/indra/newview/skins/default/xui/de/floater_search.xml b/indra/newview/skins/default/xui/de/floater_search.xml
index d44ad44aea..bd39bf2bce 100644
--- a/indra/newview/skins/default/xui/de/floater_search.xml
+++ b/indra/newview/skins/default/xui/de/floater_search.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="SUCHEN">
+<floater name="floater_search" title="">
 	<floater.string name="loading_text">
 		Wird geladen...
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index 00f983b77c..49b133e10f 100644
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -24,20 +24,11 @@
 	<floater.string name="status_selectland">
 		Klicken und ziehen, um Land auszuwählen
 	</floater.string>
-	<floater.string name="grid_screen_text">
-		Bildschirm
+	<floater.string name="status_selectcount">
+		[OBJ_COUNT] Objekte ([PRIM_COUNT] Prims [PE_STRING]) ausgewählt
 	</floater.string>
-	<floater.string name="grid_local_text">
-		Lokal
-	</floater.string>
-	<floater.string name="grid_world_text">
-		Welt
-	</floater.string>
-	<floater.string name="grid_reference_text">
-		Referenz
-	</floater.string>
-	<floater.string name="grid_attachment_text">
-		Anhang
+	<floater.string name="status_selectprimequiv">
+		, Prim-Äquivalenz [SEL_WEIGHT]
 	</floater.string>
 	<button label="" label_selected="" name="button focus" tool_tip="Fokus"/>
 	<button label="" label_selected="" name="button move" tool_tip="Verschieben"/>
@@ -66,20 +57,12 @@
 	<check_box label="Verknüpfte Teile bearbeiten" name="checkbox edit linked parts"/>
 	<button label="Link" name="link_btn" width="30"/>
 	<button label="Verknüpfung auflösen" name="unlink_btn" width="126"/>
-	<text left_pad="0" name="RenderingCost" tool_tip="Zeigt die errechneten Wiedergabekosten für dieses Objekt">
-		þ: [COUNT]
-	</text>
 	<check_box label="" name="checkbox uniform"/>
 	<text label="Beide Seiten dehnen" name="checkbox uniform label">
 		Beide Seiten dehnen
 	</text>
 	<check_box initial_value="true" label="Texturen dehnen" name="checkbox stretch textures" top_pad="-5"/>
-	<check_box initial_value="true" label="An Raster ausrichten" name="checkbox snap to grid" top_pad="15"/>
-	<combo_box name="combobox grid mode" tool_tip="Wählen Sie ein Rasterlineal zum Positionieren des Objekts aus.">
-		<combo_box.item label="Globales Raster" name="World"/>
-		<combo_box.item label="Lokales Raster" name="Local"/>
-		<combo_box.item label="Referenzraster" name="Reference"/>
-	</combo_box>
+	<check_box initial_value="true" label="Einrasten" name="checkbox snap to grid" top_pad="15"/>
 	<button label="Optionen..." label_selected="Optionen..." name="Options..." tool_tip="Mehr Raster-Optionen anzeigen"/>
 	<button label="" label_selected="" name="ToolCube" tool_tip="Würfel"/>
 	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/>
@@ -119,23 +102,11 @@
 		Stärke
 	</text>
 	<button label="Übernehmen" label_selected="Übernehmen" name="button apply to selection" tool_tip="Ausgewähltes Land bearbeiten"/>
-	<text name="obj_count">
-		Objekte: [COUNT]
-	</text>
-	<text name="prim_count">
-		Primitive: [COUNT]
-	</text>
-	<text name="linked_set_count">
-		Verknüpfte Sätze: [COUNT]
-	</text>
-	<text name="linked_set_cost" tool_tip="Kosten der gegenwärtig ausgewählten verknüpften Sätze als [Prims],[Komplexität der Physik]">
-		Kosten: [COST] / [PHYSICS]
-	</text>
-	<text name="object_count">
-		Objekte: [COUNT]
+	<text name="selection_empty">
+		Nichts ausgewählt.
 	</text>
-	<text name="object_cost" tool_tip="Kosten der gegenwärtig ausgewählten Objekte als [Prims] / [Komplexität der Physik]">
-		Kosten: [COST] / [PHYSICS]
+	<text name="selection_weight">
+		Physikgewicht [PHYS_WEIGHT], Darstellungskosten [DISP_WEIGHT].
 	</text>
 	<tab_container name="Object Info Tabs">
 		<panel label="Allgemein" name="General">
@@ -356,7 +327,6 @@
 				<combo_box.item label="Torus" name="Torus"/>
 				<combo_box.item label="Fläche" name="Plane"/>
 				<combo_box.item label="Zylinder" name="Cylinder"/>
-				<combo_box.item label="Netz" name="Mesh"/>
 			</combo_box>
 		</panel>
 		<panel label="Eigenschaften" name="Features">
diff --git a/indra/newview/skins/default/xui/de/floater_voice_effect.xml b/indra/newview/skins/default/xui/de/floater_voice_effect.xml
index 21031cd556..3dc0fc2322 100644
--- a/indra/newview/skins/default/xui/de/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/de/floater_voice_effect.xml
@@ -12,6 +12,114 @@
 	<string name="new_voice_effect">
 		(Neu!)
 	</string>
+	<string name="effect_Arena">
+		Arena
+	</string>
+	<string name="effect_Beast">
+		Bestie
+	</string>
+	<string name="effect_Buff">
+		Muskulös
+	</string>
+	<string name="effect_Buzz">
+		Buzz
+	</string>
+	<string name="effect_Camille">
+		Camille
+	</string>
+	<string name="effect_Creepy">
+		Unheimlich
+	</string>
+	<string name="effect_CreepyBot">
+		UnheimlicherBot
+	</string>
+	<string name="effect_Cyber">
+		Cyber
+	</string>
+	<string name="effect_DeepBot">
+		TieferBot
+	</string>
+	<string name="effect_Demon">
+		Dämon
+	</string>
+	<string name="effect_Flirty">
+		Kokett
+	</string>
+	<string name="effect_Foxy">
+		Attraktiv
+	</string>
+	<string name="effect_Halloween_2010_Bonus">
+		Bonus_Halloween_2010
+	</string>
+	<string name="effect_Helium">
+		Helium
+	</string>
+	<string name="effect_Husky">
+		Rauchig
+	</string>
+	<string name="effect_Intercom">
+		Intercom
+	</string>
+	<string name="effect_Macho">
+		Macho
+	</string>
+	<string name="effect_Micro">
+		Micro
+	</string>
+	<string name="effect_Mini">
+		Mini
+	</string>
+	<string name="effect_Nano">
+		Nano
+	</string>
+	<string name="effect_Nightmare">
+		Alptraum
+	</string>
+	<string name="effect_PopBot">
+		PopBot
+	</string>
+	<string name="effect_Rachel">
+		Rachel
+	</string>
+	<string name="effect_Radio">
+		Radio
+	</string>
+	<string name="effect_Robot">
+		Roboter
+	</string>
+	<string name="effect_Roxanne">
+		Roxanne
+	</string>
+	<string name="effect_Sabrina">
+		Sabrina
+	</string>
+	<string name="effect_Samantha">
+		Samantha
+	</string>
+	<string name="effect_Sexy">
+		Sexy
+	</string>
+	<string name="effect_Shorty">
+		Shorty
+	</string>
+	<string name="effect_Sneaky">
+		Hinterhältig
+	</string>
+	<string name="effect_Stallion">
+		Hengst
+	</string>
+	<string name="effect_Sultry">
+		Feurig
+	</string>
+	<string name="effect_Thunder">
+		Donner
+	</string>
+	<string name="effect_Vixen">
+		Erotisch
+	</string>
+	<string name="effect_WhinyBot">
+		JammernderBot
+	</string>
 	<text name="preview_text">
 		Zur Vorschau
 	</text>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 05e47cd31a..abea3442fa 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -2072,13 +2072,14 @@ Von einer Webseite zu diesem Formular linken, um anderen leichten Zugang zu dies
 		<usetemplate ignoretext="Die Kleidung, die während dem Bearbeiten meines Aussehens erstellt wird, sofort anziehen" name="okcancelignore" notext="Nein" yestext="Ja"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Sie müssen altersüberprüft sein, um diesen Bereich betreten zu können.  Möchten Sie auf der [SECOND_LIFE]-Webseite Ihr Alter verifizieren lassen?
+		Um auf Adult-Inhalte und –Bereiche in Second Life zuzugreifen, müssen Sie mindestens 18 Jahre alt sein. Bitte besuchen Sie die Altersüberprüfungsseite, um zu bestätigen, dass Sie mindestens 18 Jahre alt sind. 
+Hierzu wird Ihr Webbrowser geöffnet.
 
 [_URL]
 		<url name="url" option="0">
-			https://secondlife.com/account/verification.php?lang=de
+			https://secondlife.com/my/account/verification.php
 		</url>
-		<usetemplate ignoretext="Ich habe mein Alter nicht verifizieren lassen" name="okcancelignore" notext="Nein" yestext="Ja"/>
+		<usetemplate ignoretext="Ich habe mein Alter nicht verifizieren lassen" name="okcancelignore" notext="Abbrechen" yestext="Zur Altersüberprüfung"/>
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Um diesen Bereich besuchen zu können, müssen Ihre Zahlungsinformationen gespeichert sein.  Möchten Sie diese Einstellung auf der [SECOND_LIFE]-Webseite einrichten?
@@ -2769,6 +2770,12 @@ Die Schaltfläche wird angezeigt, wenn genügend Platz vorhanden ist.
 
 Details finden Sie in der Protokolldatei.
 	</notification>
+	<notification name="MeshUploadPermError">
+		Fehler beim Anfordern der Berechtigungen zum Hochladen des Netzes
+	</notification>
+	<notification name="RegionCapabilityRequestError">
+		Regionsfähigkeit „[CAPABILITY]“ konnte nicht abgerufen werden.
+	</notification>
 	<notification name="ShareItemsConfirmation">
 		Möchten Sie wirklich die folgenden Objekte:
 
diff --git a/indra/newview/skins/default/xui/de/panel_sound_devices.xml b/indra/newview/skins/default/xui/de/panel_sound_devices.xml
index da20f7e214..b739b6197f 100644
--- a/indra/newview/skins/default/xui/de/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/de/panel_sound_devices.xml
@@ -3,9 +3,18 @@
 	<panel.string name="default_text">
 		Standard
 	</panel.string>
+	<string name="name_no_device">
+		Kein Gerät
+	</string>
+	<string name="name_default_system_device">
+		Standardsystemgerät
+	</string>
 	<text name="Input">
 		Eingabe
 	</text>
+	<text name="Output">
+		Ausgabe
+	</text>
 	<text name="My volume label">
 		Meine Lautstärke:
 	</text>
@@ -13,7 +22,4 @@
 	<text name="wait_text">
 		Bitte warten
 	</text>
-	<text name="Output">
-		Ausgabe
-	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 5cfec6446b..902f97efab 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -34,6 +34,9 @@
 	<string name="StartupInitializingVFS">
 		VFS wird initialisiert...
 	</string>
+	<string name="StartupRequireDriverUpdate">
+		Grafikinitialisierung fehlgeschlagen. Bitte aktualisieren Sie Ihren Grafiktreiber.
+	</string>
 	<string name="ProgressRestoring">
 		Wird wiederhergestellt...
 	</string>
@@ -91,6 +94,12 @@
 	<string name="LoginQuicktimeOK">
 		QuickTime wurde initialisiert.
 	</string>
+	<string name="LoginRequestSeedCapGrant">
+		Regionsfähigkeiten anfordern...
+	</string>
+	<string name="LoginRetrySeedCapGrant">
+		Regionsfähigkeiten anfordern. Versuch [NUMBER]...
+	</string>
 	<string name="LoginWaitingForRegionHandshake">
 		Region-Handshake...
 	</string>
@@ -1640,6 +1649,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	</string>
 	<string name="SummaryForTheWeek" value="Zusammenfassung für diese Woche, beginnend am "/>
 	<string name="NextStipendDay" value=". Der nächste Stipendium-Tag ist "/>
+	<string name="GroupPlanningDate">
+		[mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc]
+	</string>
 	<string name="GroupIndividualShare" value="                      Gruppenanteil       Einzelanteil"/>
 	<string name="GroupColumn" value="Gruppe"/>
 	<string name="Balance">
@@ -1969,6 +1981,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="GroupMoneyDebits">
 		Soll
 	</string>
+	<string name="GroupMoneyDate">
+		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
+	</string>
 	<string name="ViewerObjectContents">
 		Inhalte
 	</string>
@@ -4170,6 +4185,87 @@ Missbrauchsbericht
 	<string name="Female - Wow">
 		Weiblich - Wow
 	</string>
+	<string name="/bow">
+		/verbeugen
+	</string>
+	<string name="/clap">
+		/klatschen
+	</string>
+	<string name="/count">
+		/zählen
+	</string>
+	<string name="/extinguish">
+		/löschen
+	</string>
+	<string name="/kmb">
+		/lmaa
+	</string>
+	<string name="/muscle">
+		/Muskel
+	</string>
+	<string name="/no">
+		/nein
+	</string>
+	<string name="/no!">
+		/nein!
+	</string>
+	<string name="/paper">
+		/Papier
+	</string>
+	<string name="/pointme">
+		/auf mich zeigen
+	</string>
+	<string name="/pointyou">
+		/auf dich zeigen
+	</string>
+	<string name="/rock">
+		/Stein
+	</string>
+	<string name="/scissor">
+		/Schere
+	</string>
+	<string name="/smoke">
+		/rauchen
+	</string>
+	<string name="/stretch">
+		/dehnen
+	</string>
+	<string name="/whistle">
+		/pfeifen
+	</string>
+	<string name="/yes">
+		/ja
+	</string>
+	<string name="/yes!">
+		/ja!
+	</string>
+	<string name="afk">
+		afk
+	</string>
+	<string name="dance1">
+		Tanzen1
+	</string>
+	<string name="dance2">
+		Tanzen2
+	</string>
+	<string name="dance3">
+		Tanzen3
+	</string>
+	<string name="dance4">
+		Tanzen4
+	</string>
+	<string name="dance5">
+		Tanzen5
+	</string>
+	<string name="dance6">
+		Tanzen6
+	</string>
+	<string name="dance7">
+		Tanzen7
+	</string>
+	<string name="dance8">
+		Tanzen8
+	</string>
 	<string name="AvatarBirthDateFormat">
 		[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
 	</string>
diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index 6d90f654d1..eaf575fc08 100644
--- a/indra/newview/skins/default/xui/en/floater_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_search.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
   legacy_header_height="18"
-  can_resize="true"
+ can_resize="true"
   height="775"
-  layout="topleft"
-  min_height="400"
+ layout="topleft"
+ min_height="400"
   min_width="500"
   name="floater_web_content"
   help_topic="floater_web_content"
-  save_rect="true"
+ save_rect="true"
   auto_tile="true"
-  save_visibility="true"
+ save_visibility="true"
   title=""
   initial_mime_type="text/html"
   width="780"
-  tab_stop="true"
+             tab_stop="true"
   filename="floater_web_content.xml"/>
diff --git a/indra/newview/skins/default/xui/en/menu_mode_change.xml b/indra/newview/skins/default/xui/en/menu_mode_change.xml
new file mode 100644
index 0000000000..87d1a0a7a2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_mode_change.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ name="Mode Change">
+  <menu_item_check
+   label="Basic"
+   name="BasicMode">
+    <on_check
+         function="CheckSessionSettings"
+         parameter="settings_minimal.xml" />
+    <on_click
+      function="ChangeMode"
+      parameter="basic"/>
+  </menu_item_check>
+    <menu_item_check
+     label="Advanced"
+     name="AdvancedMode">
+    <on_check
+     function="CheckSessionSettings"
+     parameter="" />
+    <on_click
+      function="ChangeMode"
+      parameter="advanced"/>
+    </menu_item_check>
+  </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 8d0f1437e6..0bc1be666e 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -117,33 +117,16 @@ label="Remember password"
   name="connect_btn"
   top="35"
   width="90" />
- <text
-  follows="left|bottom"
-  font="SansSerifSmall"
-  height="15"
-  left_pad="10"
-  name="mode_selection_text"
-  top="20"
-  width="130">
-       Mode:
- </text>
-<combo_box
-  follows="left|bottom"
+  <menu_button
+  left_pad="5"
+  top="35"
+  width="80"
   height="23"
-  max_chars="128"
+  label="Mode ▲"
+  name="mode_menu"  
   tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
-  top_pad="0"
-  name="mode_combo"
-  width="110">
-<combo_box.item
-  label="Basic"
-  name="Basic"
-  value="settings_minimal.xml" />
-<combo_box.item
-  label="Advanced"
-  name="Advanced"
-  value="" />
-</combo_box>
+  menu_filename="menu_mode_change.xml"
+    />
   <text
   follows="left|bottom"
   font="SansSerifSmall"
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 d756dfb7de..f51279adb4 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -77,6 +77,18 @@
      top="0"
      width="55" />
   </panel>
+  <menu_button
+     follows="right|top"    
+    image_color="0 0 0 0"
+    hover_glow_amount="0"
+    left_pad="2"
+    top="0"
+    width="55"
+    height="18"
+    label="Mode ▼"
+    tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
+    menu_filename="menu_mode_change.xml"
+    />
     <text
      type="string"
      font="SansSerifSmall"
@@ -89,7 +101,7 @@
      left_pad="0"
      name="TimeText"
      tool_tip="Current time (Pacific)"
-     width="145">
+     width="70">
         24:00 AM PST
     </text>
     <button
diff --git a/indra/newview/skins/default/xui/es/floater_build_options.xml b/indra/newview/skins/default/xui/es/floater_build_options.xml
index 9d63abd73c..a3e656cc17 100644
--- a/indra/newview/skins/default/xui/es/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/es/floater_build_options.xml
@@ -1,7 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="OPCIONES DE LA CUADRÍCULA">
-	<spinner label="Unidad de la cuadrícula (metros)" label_width="192" name="GridResolution" width="250"/>
-	<spinner label="Alcance de la cuadrícula (metros)" label_width="192" name="GridDrawSize" width="250"/>
+	<floater.string name="grid_screen_text">
+		Pantalla
+	</floater.string>
+	<floater.string name="grid_local_text">
+		Local
+	</floater.string>
+	<floater.string name="grid_world_text">
+		Mundo
+	</floater.string>
+	<floater.string name="grid_reference_text">
+		Referencia
+	</floater.string>
+	<floater.string name="grid_attachment_text">
+		Adjunto
+	</floater.string>
+	<text name="grid_mode_label" tool_tip="Opacidad de la cuadrícula">
+		Modo
+	</text>
+	<combo_box name="combobox grid mode" tool_tip="Elige qué cuadricula usar para posicionar el objeto">
+		<combo_box.item label="Mundo" name="World"/>
+		<combo_box.item label="Local" name="Local"/>
+		<combo_box.item label="Referencia" name="Reference"/>
+	</combo_box>
+	<spinner label="Unidades (metros)" label_width="192" name="GridResolution" width="250"/>
+	<spinner label="Extensión (metros)" label_width="192" name="GridDrawSize" width="250"/>
 	<check_box label="Activar subunidades" name="GridSubUnit"/>
 	<check_box label="Ver la sección transversal" name="GridCrossSection"/>
 	<text name="grid_opacity_label" tool_tip="Opacidad de la cuadrícula">
diff --git a/indra/newview/skins/default/xui/es/floater_model_preview.xml b/indra/newview/skins/default/xui/es/floater_model_preview.xml
index 0af44e1d91..36f988b25f 100644
--- a/indra/newview/skins/default/xui/es/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_model_preview.xml
@@ -60,6 +60,9 @@
 	<string name="simplifying">
 		Simplificando...
 	</string>
+	<string name="tbd">
+		TBD
+	</string>
 	<text name="name_label">
 		Nombre:
 	</text>
@@ -80,23 +83,26 @@
 			Nivel de detalle: Mínimo
 		</combo_item>
 	</combo_box>
-	<panel>
-		<text name="streaming cost">
-			Coste de recursos: [COSTE]
-		</text>
-		<text name="physics cost">
-			Coste físico: [COSTE]
-		</text>
-		<text name="upload fee">
-			Cuota de carga: N/A
-		</text>
-	</panel>
-	<text name="status">
-		[ESTADO]
+	<text name="warning_title">
+		ATENCIÓN:
+	</text>
+	<text name="warning_message">
+		No podrás terminar de subir este modelo a los servidores de Second Life. [[VURL] Averigua cómo] puedes obtener autorización para subir modelos de malla.
+	</text>
+	<text name="weights_text">
+		Descargar:
+Física:
+Servidor:
+
+Equiv. en prims:
+	</text>
+	<text name="weights">
+		[ST]
+[PH]
+[SIM]
+
+[EQ]
 	</text>
-	<button label="Valores predeterminados" name="reset_btn" tool_tip="Restablecer valores predeterminados"/>
-	<button label="Subir" name="ok_btn" tool_tip="Cargar al simulador"/>
-	<button label="Cancelar" name="cancel_btn"/>
 	<tab_container name="import_tab">
 		<panel label="Nivel de detalle" name="lod_panel">
 			<text name="lod_table_header">
@@ -234,4 +240,11 @@
 			<spinner name="pelvis_offset" value="0.0"/>
 		</panel>
 	</tab_container>
+	<text name="upload_fee">
+		Precio de subida: L$ [FEE]
+	</text>
+	<button label="Establecer en valores predeterminados" name="reset_btn" tool_tip="Establecer en valores predeterminados"/>
+	<button label="Calcular pesos y precio" name="calculate_btn" tool_tip="Calcular pesos y precio"/>
+	<button label="Subir" name="ok_btn" tool_tip="Cargar al simulador"/>
+	<button label="Cancelar" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_model_wizard.xml b/indra/newview/skins/default/xui/es/floater_model_wizard.xml
index a2c6c456eb..86de557ed9 100644
--- a/indra/newview/skins/default/xui/es/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/es/floater_model_wizard.xml
@@ -2,190 +2,216 @@
 <floater name="Model Wizard" title="CARGAR ASISTENTE DE MODELO">
 	<button label="5. Subir" name="upload_btn"/>
 	<button label="4. Revisar" name="review_btn"/>
-	<button label="3. Física" name="physics2_btn"/>
 	<button label="3. Física" name="physics_btn"/>
 	<button label="2. Optimizar" name="optimize_btn"/>
 	<button label="1. Seleccionar archivo" name="choose_file_btn"/>
 	<panel name="choose_file_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Cargar modelo
+		<panel name="choose_file_header_panel">
+			<text name="choose_file_header_text">
+				Elige el archivo de modelo
 			</text>
 		</panel>
-		<text name="description">
-			Este asistente te ayudará a importar modelos de redes en Second Life.  En primer lugar, especifica un archivo que contenga el modelo que desees importar.  Second Life es compatible con los archivos de COLLADA (.dae).
-		</text>
-		<panel name="content">
-			<text name="Cache location">
-				Nombre del archivo:
+		<panel name="choose_file_content_panel">
+			<text name="advanced_users_text">
+				Usuarios avanzados: si tienes experiencia con las herramientas de creación de contenidos 3D, quizá te interese utilizar la función de subida avanzada.
+			</text>
+			<button label="Cambiar al modo Avanzado" name="switch_to_advanced"/>
+			<text name="choose_model_file_label">
+				Elige el archivo de modelo que deseas subir
+			</text>
+			<button label="Buscar..." label_selected="Buscar..." name="browse"/>
+			<text name="support_collada_text">
+				‎Second Life admite los archivos COLLADA (.dae)
+			</text>
+			<text name="dimensions_label">
+				Dimensiones (metros):
 			</text>
-			<button label="Examinar..." label_selected="Examinar..." name="browse"/>
 			<text name="dimensions">
-				X:         Y:         Z:
+				X         Y         Z
+			</text>
+			<text name="warning_label">
+				ATENCIÓN:
 			</text>
-			<text name="dimension_dividers">
-				|               |
+			<text name="warning_text">
+				No podrás completar el paso final de la subida de este modelo a los servidores de Second Life. [secondlife:///app/floater/learn_more Averigua cómo] configurar tu cuenta para subir modelos de malla.
 			</text>
 		</panel>
 	</panel>
 	<panel name="optimize_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Optimizar
+		<panel name="optimize_header_panel">
+			<text name="optimize_header_text">
+				Optimizar el modelo
 			</text>
 		</panel>
-		<text name="description">
-			Este asistente ha optimizado tu modelo con el fin de mejorar el rendimiento. Puedes ajustar los resultados del proceso de optimización a continuación o hacer clic en Siguiente para continuar.
+		<text name="optimize_hint">
+			Hemos optimizado el rendimiento del modelo, pero puedes ajustarlo más si lo deseas.
 		</text>
-		<panel name="content">
+		<panel name="optimize_content_panel">
+			<text name="generating_lod_label">
+				Generando el nivel de detalle
+			</text>
 			<text name="high_detail_text">
-				Generar nivel de detalle: Alto
+				Generar el nivel de detalle: Alto
 			</text>
 			<text name="medium_detail_text">
-				Generar nivel de detalle: Media
+				Generar el nivel de detalle: Medio
 			</text>
 			<text name="low_detail_text">
-				Generar nivel de detalle: Bajo
+				Generar el nivel de detalle: Bajo
 			</text>
 			<text name="lowest_detail_text">
-				Generar nivel de detalle: Mínimo
+				Generar el nivel de detalle: Mínimo
 			</text>
 		</panel>
 		<panel name="content2">
-			<text name="lod_label">
-				Vista previa de modelo:
+			<text name="optimize_performance_text">
+				Rendimiento
+			</text>
+			<text name="optimize_faster_rendering_text">
+				Renderizado más rápido
+Menos detalles
+Menos peso de prim
+			</text>
+			<text name="optimize_accuracy_text">
+				Precisión
+			</text>
+			<text name="optimize_slower_rendering_text">
+				Renderizado más lento
+Más detalles
+Más peso de prim
+			</text>
+			<text name="accuracy_slider_mark1">
+				&apos;
+			</text>
+			<text name="accuracy_slider_mark2">
+				&apos;
 			</text>
-			<combo_box name="preview_lod_combo2" tool_tip="Nivel de detalle disponible en la vista previa">
-				<combo_item name="high">
-					Alto
+			<text name="accuracy_slider_mark3">
+				&apos;
+			</text>
+			<button label="Recalcular la geometría" name="recalculate_geometry_btn"/>
+			<text name="geometry_preview_label">
+				Vista previa de geometría
+			</text>
+			<combo_box name="preview_lod_combo" tool_tip="LOD para ver en renderizado de prueba">
+				<combo_item name="preview_lod_high">
+					Detalle alto
 				</combo_item>
-				<combo_item name="medium">
-					Media
+				<combo_item name="preview_lod_medium">
+					Detalles medios
 				</combo_item>
-				<combo_item name="low">
-					Bajo
+				<combo_item name="preview_lod_low">
+					Detalle bajo
 				</combo_item>
-				<combo_item name="lowest">
-					Mínimo
+				<combo_item name="preview_lod_lowest">
+					Detalles mínimos
 				</combo_item>
 			</combo_box>
-			<text name="streaming cost">
-				Coste de recursos:    [COSTE]
-			</text>
-			<text name="dimensions">
-				X:         Y:         Z:
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
 		</panel>
 	</panel>
 	<panel name="physics_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Física
+		<panel name="physics_header_panel">
+			<text name="physics_header_text">
+				Ajustar la física
 			</text>
 		</panel>
-		<text name="description">
-			El asistente creará una forma física, que determinará la manera en la que el objeto interactúa con otros objetos y avatares. Selecciona con el controlador deslizante el nivel de detalle más adecuado en función del uso del objeto:
+		<text name="physics_hint">
+			Crearemos una forma para la apariencia exterior del modelo. Ajusta el nivel de detalle de la forma según se necesite para el propósito proyectado del modelo.
 		</text>
-		<panel name="content">
-			<text name="streaming cost">
-				Coste de recursos:       [COSTE]
+		<panel name="physics_content_panel">
+			<text name="physics_performance_text">
+				Rendimiento
 			</text>
-		</panel>
-	</panel>
-	<panel name="physics2_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Física
+			<text name="physics_faster_rendering_text">
+				Renderizado más rápido
+Menos detalles
+Menos peso de prim
 			</text>
-		</panel>
-		<text name="description">
-			Obtén una vista previa de la forma física a continuación y haz clic en Siguiente para continuar.  Para modificar la forma física, haz clic en el botón Atrás.
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				Vista previa de modelo:
+			<text name="physics_accuracy_text">
+				Precisión
 			</text>
-			<combo_box name="preview_lod_combo3" tool_tip="Nivel de detalle disponible en la vista previa">
-				<combo_item name="high">
-					Alto
+			<text name="physics_slower_dendering_text">
+				Renderizado más lento
+Más detalles
+Más peso de prim
+			</text>
+			<text name="physics_example_1">
+				Ejemplos:
+Objetos en movimiento
+Objetos voladores
+Vehículos
+			</text>
+			<text name="physics_example_2">
+				Ejemplos:
+Objetos estáticos pequeños
+Objetos con menos detalles
+Muebles sencillos
+			</text>
+			<text name="physics_example_3">
+				Ejemplos:
+Objetos estáticos
+Objetos con detalles
+Edificios
+			</text>
+			<button label="Recalcular física" name="recalculate_physics_btn"/>
+			<button label="Recalculando..." name="recalculating_physics_btn"/>
+			<text name="physics_preview_label">
+				Prueba de física
+			</text>
+			<combo_box name="preview_lod_combo2" tool_tip="LOD para ver en renderizado de prueba">
+				<combo_item name="preview_lod2_high">
+					Detalle alto
 				</combo_item>
-				<combo_item name="medium">
-					Media
+				<combo_item name="preview_lod2_medium">
+					Detalles medios
 				</combo_item>
-				<combo_item name="low">
-					Bajo
+				<combo_item name="preview_lod2_low">
+					Detalle bajo
 				</combo_item>
-				<combo_item name="lowest">
-					Mínimo
+				<combo_item name="preview_lod2_lowest">
+					Detalles mínimos
 				</combo_item>
 			</combo_box>
-			<text name="dimensions">
-				X:         Y:         Z:
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
-			<text name="streaming cost">
-				Coste de recursos:       [COSTE]
-			</text>
 		</panel>
 	</panel>
 	<panel name="review_panel">
-		<panel name="header_panel">
-			<text name="header_text">
+		<panel name="review_header_panel">
+			<text name="review_header_text">
 				Revisar
 			</text>
 		</panel>
-		<text name="description">
-			Revisa los detalles que aparecen más abajo y, a continuación, haz clic. Selecciona la opción de carga para cargar el modelo. Se realizará el cargo en tu saldo de L$ cuando hagas clic en Cargar.
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				Vista previa de modelo:
+		<panel name="review_content_panel">
+			<text name="review_prim_equiv">
+				Impacto en la parcela/región: [EQUIV] equivalentes en prim
 			</text>
-			<combo_box name="preview_lod_combo" tool_tip="Nivel de detalle disponible en la vista previa">
-				<combo_item name="high">
-					Alto
-				</combo_item>
-				<combo_item name="medium">
-					Media
-				</combo_item>
-				<combo_item name="low">
-					Bajo
-				</combo_item>
-				<combo_item name="lowest">
-					Mínimo
-				</combo_item>
-			</combo_box>
-			<text name="dimensions">
-				X:         Y:         Z:
+			<text name="review_fee">
+				Cargaremos en tu cuenta el precio de subida de L$ [FEE].
 			</text>
-			<text name="dimension_dividers">
-				|               |
+			<text name="review_confirmation">
+				Al pulsar en el botón de subida, confirmas que posees los derechos necesarios sobre el material que contiene el modelo.
 			</text>
 		</panel>
-		<text name="streaming cost">
-			Coste de recursos:         [COSTE]
-		</text>
-		<text name="physics cost">
-			Coste físico:        [COSTE]
-		</text>
 	</panel>
 	<panel name="upload_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Carga completa.
+		<panel name="upload_header_panel">
+			<text name="upload_header_text">
+				Subida finalizada
 			</text>
 		</panel>
-		<text name="description">
-			¡Felicidades! Tu modelo se ha cargado correctamente.  Encontrarás el modelo en la carpeta Objetos del inventario.
+		<text name="model_uploaded_text">
+			Se ha subido tu modelo.
+		</text>
+		<text name="inventory_text">
+			Puedes buscar la carpeta Objetos en tu inventario.
+		</text>
+		<text name="charged_fee">
+			Se han cargado [FEE] L$ en tu cuenta.
 		</text>
 	</panel>
 	<button label="&lt;&lt; Atrás" name="back"/>
 	<button label="Siguiente &gt;&gt;" name="next"/>
+	<button label="Calcular pesos y precio &gt;&gt;" name="calculate"/>
+	<button label="Calculando..." name="calculating"/>
 	<button label="Subir" name="upload" tool_tip="Cargar al simulador"/>
 	<button label="Cancelar" name="cancel"/>
 	<button label="Cerrar" name="close"/>
diff --git a/indra/newview/skins/default/xui/es/floater_search.xml b/indra/newview/skins/default/xui/es/floater_search.xml
index 377b848530..e24d8064a1 100644
--- a/indra/newview/skins/default/xui/es/floater_search.xml
+++ b/indra/newview/skins/default/xui/es/floater_search.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="ENCONTRAR">
+<floater name="floater_search" title="">
 	<floater.string name="loading_text">
 		Cargando...
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml
index 70eac1e2c5..f6e246ebae 100644
--- a/indra/newview/skins/default/xui/es/floater_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_tools.xml
@@ -24,20 +24,11 @@
 	<floater.string name="status_selectland">
 		Pulsa y arrastra para seleccionar el terreno.
 	</floater.string>
-	<floater.string name="grid_screen_text">
-		Pantalla
+	<floater.string name="status_selectcount">
+		[OBJ_COUNT] objetos ( [PRIM_COUNT] prims[PE_STRING] ) seleccionados
 	</floater.string>
-	<floater.string name="grid_local_text">
-		Local
-	</floater.string>
-	<floater.string name="grid_world_text">
-		Mundo
-	</floater.string>
-	<floater.string name="grid_reference_text">
-		Referencia
-	</floater.string>
-	<floater.string name="grid_attachment_text">
-		Añadido
+	<floater.string name="status_selectprimequiv">
+		, [SEL_WEIGHT] equivalentes en prim
 	</floater.string>
 	<button label="" label_selected="" name="button focus" tool_tip="Visión"/>
 	<button label="" label_selected="" name="button move" tool_tip="Mover"/>
@@ -66,20 +57,12 @@
 	<check_box label="Editar las partes enlazadas" name="checkbox edit linked parts"/>
 	<button label="Enlazar" name="link_btn"/>
 	<button label="Desenlazar" name="unlink_btn" width="95"/>
-	<text name="RenderingCost" tool_tip="Muestra cuánto se calcula que cuesta renderizar este objeto">
-		þ: [COUNT]
-	</text>
 	<check_box label="" name="checkbox uniform"/>
 	<text label="Estirar ambos lados" name="checkbox uniform label">
 		Estirar ambos lados
 	</text>
 	<check_box initial_value="true" label="Estirar las texturas" name="checkbox stretch textures"/>
-	<check_box initial_value="true" label="Usar la cuadrícula" name="checkbox snap to grid"/>
-	<combo_box name="combobox grid mode" tool_tip="Elige qué cuadricula usar para posicionar el objeto" width="82">
-		<combo_box.item label="Mundo" name="World"/>
-		<combo_box.item label="Local" name="Local"/>
-		<combo_box.item label="Referencia" name="Reference"/>
-	</combo_box>
+	<check_box initial_value="true" label="Intervalo" name="checkbox snap to grid"/>
 	<button label="Opciones..." label_selected="Opciones..." name="Options..." tool_tip="Ver más opciones de la cuadrícula"/>
 	<button label="" label_selected="" name="ToolCube" tool_tip="Cubo"/>
 	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/>
@@ -119,23 +102,11 @@
 		Fuerza
 	</text>
 	<button label="Aplicar" label_selected="Aplicar" left="146" name="button apply to selection" tool_tip="Modificar el terreno seleccionado"/>
-	<text left="134" name="obj_count">
-		Objetos: [COUNT]
-	</text>
-	<text left="134" name="prim_count">
-		Primitivas: [COUNT]
-	</text>
-	<text name="linked_set_count">
-		Conjuntos con enlaces: [RECUENTO]
-	</text>
-	<text name="linked_set_cost" tool_tip="Coste de los conjuntos con enlaces actualmente seleccionados como [prims], [complejidad física]">
-		Coste: [COSTE] / [FÍSICO]
-	</text>
-	<text name="object_count">
-		Objetos: [RECUENTO]
+	<text name="selection_empty">
+		No está seleccionado nada.
 	</text>
-	<text name="object_cost" tool_tip="Coste de los objetos actualmente seleccionados como [prims] / [complejidad física]">
-		Coste: [COSTE] / [FÍSICO]
+	<text name="selection_weight">
+		Peso de física [PHYS_WEIGHT], Coste de renderizado [DISP_WEIGHT].
 	</text>
 	<tab_container name="Object Info Tabs" tab_max_width="62" tab_min_width="30" width="288">
 		<panel label="General" name="General">
@@ -353,7 +324,6 @@
 				<combo_box.item label="Toroide" name="Torus"/>
 				<combo_box.item label="Plano" name="Plane"/>
 				<combo_box.item label="Cilindro" name="Cylinder"/>
-				<combo_box.item label="Red" name="Mesh"/>
 			</combo_box>
 		</panel>
 		<panel label="Caracter." name="Features">
diff --git a/indra/newview/skins/default/xui/es/floater_voice_effect.xml b/indra/newview/skins/default/xui/es/floater_voice_effect.xml
index 5ef4347958..1a265845af 100644
--- a/indra/newview/skins/default/xui/es/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/es/floater_voice_effect.xml
@@ -12,6 +12,114 @@
 	<string name="new_voice_effect">
 		(¡Nuevo!)
 	</string>
+	<string name="effect_Arena">
+		Campo
+	</string>
+	<string name="effect_Beast">
+		Bestia
+	</string>
+	<string name="effect_Buff">
+		Musculoso
+	</string>
+	<string name="effect_Buzz">
+		Murmullo
+	</string>
+	<string name="effect_Camille">
+		Camila
+	</string>
+	<string name="effect_Creepy">
+		Aterrador
+	</string>
+	<string name="effect_CreepyBot">
+		Robot aterrador
+	</string>
+	<string name="effect_Cyber">
+		Cyber
+	</string>
+	<string name="effect_DeepBot">
+		Robot profundo
+	</string>
+	<string name="effect_Demon">
+		Diablo
+	</string>
+	<string name="effect_Flirty">
+		Coqueta
+	</string>
+	<string name="effect_Foxy">
+		Astuto
+	</string>
+	<string name="effect_Halloween_2010_Bonus">
+		Halloween_2010_Bonus
+	</string>
+	<string name="effect_Helium">
+		Helio
+	</string>
+	<string name="effect_Husky">
+		Corpulento
+	</string>
+	<string name="effect_Intercom">
+		Intercom
+	</string>
+	<string name="effect_Macho">
+		Macho
+	</string>
+	<string name="effect_Micro">
+		Micro
+	</string>
+	<string name="effect_Mini">
+		Mini
+	</string>
+	<string name="effect_Nano">
+		Nano
+	</string>
+	<string name="effect_Nightmare">
+		Pesadilla
+	</string>
+	<string name="effect_PopBot">
+		Robot pop
+	</string>
+	<string name="effect_Rachel">
+		Raquel
+	</string>
+	<string name="effect_Radio">
+		Radio
+	</string>
+	<string name="effect_Robot">
+		Robot
+	</string>
+	<string name="effect_Roxanne">
+		Roxana
+	</string>
+	<string name="effect_Sabrina">
+		Sabrina
+	</string>
+	<string name="effect_Samantha">
+		Samanta
+	</string>
+	<string name="effect_Sexy">
+		Sexy
+	</string>
+	<string name="effect_Shorty">
+		Bajito
+	</string>
+	<string name="effect_Sneaky">
+		Furtivo
+	</string>
+	<string name="effect_Stallion">
+		Mujeriego
+	</string>
+	<string name="effect_Sultry">
+		Sensual
+	</string>
+	<string name="effect_Thunder">
+		Trueno
+	</string>
+	<string name="effect_Vixen">
+		Tigresa
+	</string>
+	<string name="effect_WhinyBot">
+		Robot llorica
+	</string>
 	<text name="preview_text">
 		Para probarla
 	</text>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index a1cd676142..1a75beed3f 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -2066,13 +2066,14 @@ Publícala en una página web para que otros puedan acceder fácilmente a esta p
 		<usetemplate ignoretext="Ponerme la ropa que estoy creando mientras modifico mi apariencia" name="okcancelignore" notext="No" yestext="Sí"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Debes haber verificado tu edad para visitar este sitio.  ¿Quieres ir al sitio web de [SECOND_LIFE] y verificarla?
+		Para acceder al contenido Adulto y los lugares de Second Life con dicho carácter, debes tener por lo menos 18 años. Visita la página de verificación de edad para confirmar que tienes más de 18 años. 
+Al hacerlo se iniciará el navegador web.
 
 [_URL]
 		<url name="url" option="0">
-			https://secondlife.com/account/verification.php?lang=es
+			https://secondlife.com/my/account/verification.php
 		</url>
-		<usetemplate ignoretext="No he verificado mi edad" name="okcancelignore" notext="No" yestext="Sí"/>
+		<usetemplate ignoretext="No he verificado mi edad" name="okcancelignore" notext="Cancelar" yestext="Ir a Verificación de la edad"/>
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Para visitar este sitio debes haber aportado información de pago en tu cuenta.  ¿Quieres ir al sitio web de [SECOND_LIFE] y configurar esto?
@@ -2761,6 +2762,12 @@ Se mostrará cuando haya suficiente espacio.
 
 Consulta los detalles en el archivo de registro.
 	</notification>
+	<notification name="MeshUploadPermError">
+		Error al solicitar los permisos para subir la malla.
+	</notification>
+	<notification name="RegionCapabilityRequestError">
+		No se ha podido obtener la capacidad de la región &apos;[CAPABILITY]&apos;.
+	</notification>
 	<notification name="ShareItemsConfirmation">
 		¿Estás seguro de que quieres compartir los elementos siguientes?
 
diff --git a/indra/newview/skins/default/xui/es/panel_sound_devices.xml b/indra/newview/skins/default/xui/es/panel_sound_devices.xml
index acf5c68cda..9531b99cc8 100644
--- a/indra/newview/skins/default/xui/es/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/es/panel_sound_devices.xml
@@ -3,9 +3,18 @@
 	<panel.string name="default_text">
 		Por defecto
 	</panel.string>
+	<string name="name_no_device">
+		Ningún dispositivo
+	</string>
+	<string name="name_default_system_device">
+		Dispositivo del sistema por defecto
+	</string>
 	<text name="Input">
 		Entrada
 	</text>
+	<text name="Output">
+		Salida
+	</text>
 	<text name="My volume label">
 		Mi volumen:
 	</text>
@@ -13,7 +22,4 @@
 	<text name="wait_text">
 		Por favor, espera
 	</text>
-	<text name="Output">
-		Salida
-	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 51ac3849ed..2c33177ab4 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -25,6 +25,9 @@
 	<string name="StartupInitializingVFS">
 		Iniciando VFS...
 	</string>
+	<string name="StartupRequireDriverUpdate">
+		Error de inicialización de gráficos. Actualiza tu controlador de gráficos.
+	</string>
 	<string name="ProgressRestoring">
 		Restaurando...
 	</string>
@@ -79,6 +82,12 @@
 	<string name="LoginQuicktimeOK">
 		QuickTime se ha iniciado adecuadamente.
 	</string>
+	<string name="LoginRequestSeedCapGrant">
+		Solicitando capacidades de la región...
+	</string>
+	<string name="LoginRetrySeedCapGrant">
+		Solicitando capacidades de la región, intento [NUMBER]...
+	</string>
 	<string name="LoginWaitingForRegionHandshake">
 		Esperando la conexión con la región...
 	</string>
@@ -1613,6 +1622,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	</string>
 	<string name="SummaryForTheWeek" value="Resumen de esta semana, empezando el "/>
 	<string name="NextStipendDay" value=". El próximo día de pago es el "/>
+	<string name="GroupPlanningDate">
+		[mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc]
+	</string>
 	<string name="GroupIndividualShare" value="Grupo       Aportaciones individuales"/>
 	<string name="GroupColumn" value="Grupo"/>
 	<string name="Balance">
@@ -1936,6 +1948,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="GroupMoneyDebits">
 		Débitos
 	</string>
+	<string name="GroupMoneyDate">
+		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
+	</string>
 	<string name="ViewerObjectContents">
 		Contenidos
 	</string>
@@ -4074,6 +4089,87 @@ Denuncia de infracción
 	<string name="Female - Wow">
 		Mujer - Admiración
 	</string>
+	<string name="/bow">
+		/reverencia
+	</string>
+	<string name="/clap">
+		/aplaudir
+	</string>
+	<string name="/count">
+		/contar
+	</string>
+	<string name="/extinguish">
+		/apagar
+	</string>
+	<string name="/kmb">
+		/bmc
+	</string>
+	<string name="/muscle">
+		/músculo
+	</string>
+	<string name="/no">
+		/no
+	</string>
+	<string name="/no!">
+		/¡no!
+	</string>
+	<string name="/paper">
+		/papel
+	</string>
+	<string name="/pointme">
+		/señalarme
+	</string>
+	<string name="/pointyou">
+		/señalarte
+	</string>
+	<string name="/rock">
+		/piedra
+	</string>
+	<string name="/scissor">
+		/tijera
+	</string>
+	<string name="/smoke">
+		/fumar
+	</string>
+	<string name="/stretch">
+		/estirar
+	</string>
+	<string name="/whistle">
+		/silbar
+	</string>
+	<string name="/yes">
+		/sí
+	</string>
+	<string name="/yes!">
+		/¡sí!
+	</string>
+	<string name="afk">
+		ausente
+	</string>
+	<string name="dance1">
+		baile1
+	</string>
+	<string name="dance2">
+		baile2
+	</string>
+	<string name="dance3">
+		baile3
+	</string>
+	<string name="dance4">
+		baile4
+	</string>
+	<string name="dance5">
+		baile5
+	</string>
+	<string name="dance6">
+		baile6
+	</string>
+	<string name="dance7">
+		baile7
+	</string>
+	<string name="dance8">
+		baile8
+	</string>
 	<string name="AvatarBirthDateFormat">
 		[day,datetime,slt]/[mthnum,datetime,slt]/[year,datetime,slt]
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_build_options.xml b/indra/newview/skins/default/xui/fr/floater_build_options.xml
index cad00ea866..a200ed192f 100644
--- a/indra/newview/skins/default/xui/fr/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/fr/floater_build_options.xml
@@ -1,7 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="OPTIONS DE LA GRILLE">
+	<floater.string name="grid_screen_text">
+		Écran
+	</floater.string>
+	<floater.string name="grid_local_text">
+		Locale
+	</floater.string>
+	<floater.string name="grid_world_text">
+		Monde
+	</floater.string>
+	<floater.string name="grid_reference_text">
+		Référence
+	</floater.string>
+	<floater.string name="grid_attachment_text">
+		Élément attaché
+	</floater.string>
+	<text name="grid_mode_label" tool_tip="Opacité de la grille">
+		Mode
+	</text>
+	<combo_box name="combobox grid mode" tool_tip="Choisir le type d&apos;axe de grille pour le positionnement de l&apos;objet.">
+		<combo_box.item label="Grille du monde" name="World"/>
+		<combo_box.item label="Grille locale" name="Local"/>
+		<combo_box.item label="Grille de référence" name="Reference"/>
+	</combo_box>
 	<spinner label="Unités (mètres)" name="GridResolution"/>
-	<spinner label="Mesures (mètres)" name="GridDrawSize"/>
+	<spinner label="Étendue (mètres)" name="GridDrawSize"/>
 	<check_box label="Fixation des sous-unités" name="GridSubUnit"/>
 	<check_box label="Afficher les sections transversales" name="GridCrossSection"/>
 	<text name="grid_opacity_label" tool_tip="Opacité de la grille">
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 4788f674c8..2639339be5 100644
--- a/indra/newview/skins/default/xui/fr/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_model_preview.xml
@@ -60,6 +60,9 @@
 	<string name="simplifying">
 		Simplification...
 	</string>
+	<string name="tbd">
+		TBD
+	</string>
 	<text name="name_label">
 		Nom :
 	</text>
@@ -80,23 +83,26 @@
 			Niveau de détail : Le plus faible
 		</combo_item>
 	</combo_box>
-	<panel>
-		<text name="streaming cost">
-			Coût de la ressource : [COST]
-		</text>
-		<text name="physics cost">
-			Coût des propriétés physiques : [COST]
-		</text>
-		<text name="upload fee">
-			Frais de chargement : N/A
-		</text>
-	</panel>
-	<text name="status">
-		[STATUS]
+	<text name="warning_title">
+		AVERTISSEMENT :
+	</text>
+	<text name="warning_message">
+		Vous ne pourrez pas effectuer le chargement final du modèle sur les serveurs Second Life. [[VURL] Découvrez comment] activer le chargement des modèles de maillage.
+	</text>
+	<text name="weights_text">
+		Téléchargement :
+Propriétés physiques :
+Serveur :
+
+Équiv. en prims :
+	</text>
+	<text name="weights">
+		[ST]
+[PH]
+[SIM]
+
+[EQ]
 	</text>
-	<button label="Valeurs par défaut" name="reset_btn" tool_tip="Rétablir les valeurs par défaut."/>
-	<button label="Charger" name="ok_btn" tool_tip="Charger dans le simulateur."/>
-	<button label="Annuler" name="cancel_btn"/>
 	<tab_container name="import_tab">
 		<panel label="Niveau de détail" name="lod_panel">
 			<text name="lod_table_header">
@@ -234,4 +240,11 @@
 			<spinner name="pelvis_offset" value="0.0"/>
 		</panel>
 	</tab_container>
+	<text name="upload_fee">
+		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="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_model_wizard.xml b/indra/newview/skins/default/xui/fr/floater_model_wizard.xml
index ebb87f3ba4..f564b6f71a 100644
--- a/indra/newview/skins/default/xui/fr/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/fr/floater_model_wizard.xml
@@ -2,42 +2,54 @@
 <floater name="Model Wizard" title="ASSISTANT DE CHARGEMENT DE MODÈLE">
 	<button label="5. Chargement" name="upload_btn"/>
 	<button label="4. Vérification" name="review_btn"/>
-	<button label="3. Propriétés physiques" name="physics2_btn"/>
 	<button label="3. Propriétés physiques" name="physics_btn"/>
 	<button label="2. Optimisation" name="optimize_btn"/>
 	<button label="1. Sélection du fichier" name="choose_file_btn"/>
 	<panel name="choose_file_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Charger le modèle
+		<panel name="choose_file_header_panel">
+			<text name="choose_file_header_text">
+				Choisir un fichier de modèle
 			</text>
 		</panel>
-		<text name="description">
-			Cet Assistant vous aidera à importer des modèles de maillage dans Second Life. Commencez par spécifier un fichier contenant le modèle à importer. Second Life prend en charge les fichiers COLLADA (.dae).
-		</text>
-		<panel name="content">
-			<text name="Cache location">
-				Nom du fichier :
+		<panel name="choose_file_content_panel">
+			<text name="advanced_users_text">
+				Utilisateurs expérimentés : si vous êtes habitué à utiliser des outils de création de contenu en 3D, l&apos;outil de chargement avancé est mis à votre disposition.
+			</text>
+			<button label="Passer à Avancé" name="switch_to_advanced"/>
+			<text name="choose_model_file_label">
+				Choisir un fichier de modèle à charger
 			</text>
 			<button label="Parcourir..." label_selected="Parcourir..." name="browse"/>
+			<text name="support_collada_text">
+				Second Life prend en charge les fichiers COLLADA (.dae).
+			</text>
+			<text name="dimensions_label">
+				Dimensions (mètres) :
+			</text>
 			<text name="dimensions">
-				X :         Y :         Z :
+				X         Y         Z
+			</text>
+			<text name="warning_label">
+				AVERTISSEMENT :
 			</text>
-			<text name="dimension_dividers">
-				|               |
+			<text name="warning_text">
+				Vous ne pourrez pas effectuer l&apos;étape de chargement finale du modèle sur les serveurs Second Life. [secondlife:///app/floater/learn_more Découvrez comment] configurer votre compte pour les chargements de modèle de maillage.
 			</text>
 		</panel>
 	</panel>
 	<panel name="optimize_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Optimisation
+		<panel name="optimize_header_panel">
+			<text name="optimize_header_text">
+				Optimiser le modèle
 			</text>
 		</panel>
-		<text name="description">
-			Cet Assistant a optimisé votre modèle afin d&apos;améliorer les performances. Vous pouvez ajuster les résultats du processus d&apos;optimisation ci-dessous ou cliquer sur Suiv. pour continuer.
+		<text name="optimize_hint">
+			Le modèle a été optimisé en termes de performances. Vous pouvez l&apos;ajuster si vous le souhaitez.
 		</text>
-		<panel name="content">
+		<panel name="optimize_content_panel">
+			<text name="generating_lod_label">
+				Génération du niveau de détail
+			</text>
 			<text name="high_detail_text">
 				Générer le niveau de détail : Élevé
 			</text>
@@ -52,140 +64,154 @@
 			</text>
 		</panel>
 		<panel name="content2">
-			<text name="lod_label">
-				Aperçu du modèle :
+			<text name="optimize_performance_text">
+				Performances
 			</text>
-			<combo_box name="preview_lod_combo2" tool_tip="Niveau de détail à afficher en rendu d&apos;aperçu.">
-				<combo_item name="high">
-					Élevé
+			<text name="optimize_faster_rendering_text">
+				Rendu plus rapide
+Moins de détail
+Poids en prims inférieur
+			</text>
+			<text name="optimize_accuracy_text">
+				Précision
+			</text>
+			<text name="optimize_slower_rendering_text">
+				Rendu plus lent
+Plus de détail
+Poids en prims supérieur
+			</text>
+			<text name="accuracy_slider_mark1">
+				&apos;
+			</text>
+			<text name="accuracy_slider_mark2">
+				&apos;
+			</text>
+			<text name="accuracy_slider_mark3">
+				&apos;
+			</text>
+			<button label="Recalcul géométrique" name="recalculate_geometry_btn"/>
+			<text name="geometry_preview_label">
+				Aperçu de la géométrie
+			</text>
+			<combo_box name="preview_lod_combo" tool_tip="Niveau de détail à afficher en rendu d&apos;aperçu.">
+				<combo_item name="preview_lod_high">
+					Niveau de détail élevé
 				</combo_item>
-				<combo_item name="medium">
-					Moyen
+				<combo_item name="preview_lod_medium">
+					Niveau de détail moyen
 				</combo_item>
-				<combo_item name="low">
-					Faible
+				<combo_item name="preview_lod_low">
+					Niveau de détail faible
 				</combo_item>
-				<combo_item name="lowest">
-					Le plus faible
+				<combo_item name="preview_lod_lowest">
+					Niveau de détail le plus faible
 				</combo_item>
 			</combo_box>
-			<text name="streaming cost">
-				Coût de la ressource :    [COST]
-			</text>
-			<text name="dimensions">
-				X :         Y :         Z :
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
 		</panel>
 	</panel>
 	<panel name="physics_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Propriétés physiques
+		<panel name="physics_header_panel">
+			<text name="physics_header_text">
+				Ajuster les propriétés physiques
 			</text>
 		</panel>
-		<text name="description">
-			Cet Assistant créera une forme physique déterminant le mode d&apos;interaction de l&apos;objet avec les autres objets et avatars. Réglez le curseur sur le niveau de détail le plus approprié à l&apos;utilisation de l&apos;objet :
+		<text name="physics_hint">
+			Une forme va être créée pour l&apos;enveloppe externe du modèle. Ajustez le niveau de détail de la forme en fonction de l&apos;objectif souhaité pour votre modèle.
 		</text>
-		<panel name="content">
-			<text name="streaming cost">
-				Coût de la ressource :       [COST]
+		<panel name="physics_content_panel">
+			<text name="physics_performance_text">
+				Performances
 			</text>
-		</panel>
-	</panel>
-	<panel name="physics2_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Propriétés physiques
+			<text name="physics_faster_rendering_text">
+				Rendu plus rapide
+Moins de détail
+Poids en prims inférieur
 			</text>
-		</panel>
-		<text name="description">
-			Prévisualisez la forme physique ci-dessous, puis cliquez sur Suiv. pour continuer. Le bouton Préc. permet de modifier cette forme, le cas échéant.
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				Aperçu du modèle :
+			<text name="physics_accuracy_text">
+				Précision
 			</text>
-			<combo_box name="preview_lod_combo3" tool_tip="Niveau de détail à afficher en rendu d&apos;aperçu.">
-				<combo_item name="high">
-					Élevé
+			<text name="physics_slower_dendering_text">
+				Rendu plus lent
+Plus de détail
+Poids en prims supérieur
+			</text>
+			<text name="physics_example_1">
+				Exemples :
+Objets mobiles
+Objets volants
+Véhicules
+			</text>
+			<text name="physics_example_2">
+				Exemples :
+Petits objets statiques
+Objets moins détaillés
+Mobilier simple
+			</text>
+			<text name="physics_example_3">
+				Exemples :
+Objets statiques
+Objets détaillés
+Bâtiments
+			</text>
+			<button label="Recalcul physique" name="recalculate_physics_btn"/>
+			<button label="Recalcul en cours..." name="recalculating_physics_btn"/>
+			<text name="physics_preview_label">
+				Aperçu des propriétés physiques
+			</text>
+			<combo_box name="preview_lod_combo2" tool_tip="Niveau de détail à afficher en rendu d&apos;aperçu.">
+				<combo_item name="preview_lod2_high">
+					Niveau de détail élevé
 				</combo_item>
-				<combo_item name="medium">
-					Moyen
+				<combo_item name="preview_lod2_medium">
+					Niveau de détail moyen
 				</combo_item>
-				<combo_item name="low">
-					Faible
+				<combo_item name="preview_lod2_low">
+					Niveau de détail faible
 				</combo_item>
-				<combo_item name="lowest">
-					Le plus faible
+				<combo_item name="preview_lod2_lowest">
+					Niveau de détail le plus faible
 				</combo_item>
 			</combo_box>
-			<text name="dimensions">
-				X :         Y :         Z :
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
-			<text name="streaming cost">
-				Coût de la ressource :       [COST]
-			</text>
 		</panel>
 	</panel>
 	<panel name="review_panel">
-		<panel name="header_panel">
-			<text name="header_text">
+		<panel name="review_header_panel">
+			<text name="review_header_text">
 				Vérification
 			</text>
 		</panel>
-		<text name="description">
-			Vérifiez les détails ci-dessous, puis cliquez sur Charger pour charger le modèle. Votre solde en L$ sera alors débité.
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				Aperçu du modèle :
+		<panel name="review_content_panel">
+			<text name="review_prim_equiv">
+				Impact sur la parcelle/région : équivalent à [EQUIV] prims
 			</text>
-			<combo_box name="preview_lod_combo" tool_tip="Niveau de détail à afficher en rendu d&apos;aperçu.">
-				<combo_item name="high">
-					Élevé
-				</combo_item>
-				<combo_item name="medium">
-					Moyen
-				</combo_item>
-				<combo_item name="low">
-					Faible
-				</combo_item>
-				<combo_item name="lowest">
-					Le plus faible
-				</combo_item>
-			</combo_box>
-			<text name="dimensions">
-				X :         Y :         Z :
+			<text name="review_fee">
+				Votre compte sera débité de [FEE] L$ de frais de chargement.
 			</text>
-			<text name="dimension_dividers">
-				|               |
+			<text name="review_confirmation">
+				En cliquant sur le bouton de chargement, vous confirmez que vous disposez des droits appropriés sur le contenu du modèle.
 			</text>
 		</panel>
-		<text name="streaming cost">
-			Coût de la ressource :         [COST]
-		</text>
-		<text name="physics cost">
-			Coût des propriétés physiques :        [COST]
-		</text>
 	</panel>
 	<panel name="upload_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Chargement terminé !
+		<panel name="upload_header_panel">
+			<text name="upload_header_text">
+				Chargement terminé
 			</text>
 		</panel>
-		<text name="description">
-			Félicitations ! Votre modèle a été chargé. Il se trouve dans le dossier Objets de votre inventaire.
+		<text name="model_uploaded_text">
+			Votre modèle a été chargé.
+		</text>
+		<text name="inventory_text">
+			Vous le trouverez dans le dossier Objets de votre inventaire.
+		</text>
+		<text name="charged_fee">
+			Votre compte a été débité de [FEE] L$.
 		</text>
 	</panel>
 	<button label="&lt;&lt; Préc." name="back"/>
 	<button label="Suiv. &gt;&gt;" name="next"/>
+	<button label="Calculer les poids et les frais &gt;&gt;" name="calculate"/>
+	<button label="Calcul en cours..." name="calculating"/>
 	<button label="Charger" name="upload" tool_tip="Charger dans le simulateur."/>
 	<button label="Annuler" name="cancel"/>
 	<button label="Fermer" name="close"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_search.xml b/indra/newview/skins/default/xui/fr/floater_search.xml
index 672024466a..32800182ea 100644
--- a/indra/newview/skins/default/xui/fr/floater_search.xml
+++ b/indra/newview/skins/default/xui/fr/floater_search.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="RECHERCHER">
+<floater name="floater_search" title="">
 	<floater.string name="loading_text">
 		Chargement...
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index 908048192e..bf687c412b 100644
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -24,20 +24,11 @@
 	<floater.string name="status_selectland">
 		Cliquez et faites glisser pour sélectionner le terrain.
 	</floater.string>
-	<floater.string name="grid_screen_text">
-		Écran
+	<floater.string name="status_selectcount">
+		[OBJ_COUNT] objets ( [PRIM_COUNT] prims[PE_STRING] ) sélectionnés
 	</floater.string>
-	<floater.string name="grid_local_text">
-		Local
-	</floater.string>
-	<floater.string name="grid_world_text">
-		Monde
-	</floater.string>
-	<floater.string name="grid_reference_text">
-		Référence
-	</floater.string>
-	<floater.string name="grid_attachment_text">
-		Pièce jointe
+	<floater.string name="status_selectprimequiv">
+		, équiv. prims de [SEL_WEIGHT]
 	</floater.string>
 	<button label="" label_selected="" name="button focus" tool_tip="Mise au point"/>
 	<button label="" label_selected="" name="button move" tool_tip="Déplacer"/>
@@ -66,20 +57,12 @@
 	<check_box label="Modification liée" name="checkbox edit linked parts"/>
 	<button label="Lien" name="link_btn"/>
 	<button label="Annuler le lien" name="unlink_btn"/>
-	<text name="RenderingCost" tool_tip="Affiche le coût du rendu calculé pour cet objet">
-		þ : [COUNT]
-	</text>
 	<check_box label="" name="checkbox uniform"/>
 	<text label="Étirer les deux côtés" name="checkbox uniform label">
 		Étirer les deux côtés
 	</text>
 	<check_box initial_value="true" label="Étirer les textures" name="checkbox stretch textures"/>
-	<check_box initial_value="true" label="Fixer sur la grille" name="checkbox snap to grid"/>
-	<combo_box name="combobox grid mode" tool_tip="Choisissez le type d&apos;axe de grille pour le positionnement de l&apos;objet">
-		<combo_box.item label="Grille du monde" name="World"/>
-		<combo_box.item label="Grille locale" name="Local"/>
-		<combo_box.item label="Grille de référence" name="Reference"/>
-	</combo_box>
+	<check_box initial_value="true" label="Fixer" name="checkbox snap to grid"/>
 	<button label="Options..." label_selected="Options..." name="Options..." tool_tip="Afficher d&apos;autres options de grille"/>
 	<button label="" label_selected="" name="ToolCube" tool_tip="Cube"/>
 	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisme droit"/>
@@ -119,23 +102,11 @@
 		Force
 	</text>
 	<button label="Appliquer" label_selected="Appliquer" left="176" name="button apply to selection" tool_tip="Modifier le terrain sélectionné"/>
-	<text name="obj_count">
-		Objets : [COUNT]
-	</text>
-	<text name="prim_count">
-		Prims : [COUNT]
-	</text>
-	<text name="linked_set_count">
-		Groupes liés : [COUNT]
-	</text>
-	<text name="linked_set_cost" tool_tip="Coût des groupes liés actuellement sélectionnés en tant que [prims],[physics complexity].">
-		Coût : [COST] / [PHYSICS]
-	</text>
-	<text name="object_count">
-		Objets : [COUNT]
+	<text name="selection_empty">
+		Aucune sélection effectuée.
 	</text>
-	<text name="object_cost" tool_tip="Coût des objets actuellement sélectionnés en tant que [prims] / [physics complexity].">
-		Coût : [COST] / [PHYSICS]
+	<text name="selection_weight">
+		Poids physique [PHYS_WEIGHT], Coût de rendu [DISP_WEIGHT].
 	</text>
 	<tab_container name="Object Info Tabs">
 		<panel label="Général" name="General">
@@ -353,7 +324,6 @@
 				<combo_box.item label="Tore" name="Torus"/>
 				<combo_box.item label="Plan" name="Plane"/>
 				<combo_box.item label="Cylindre" name="Cylinder"/>
-				<combo_box.item label="Maillage" name="Mesh"/>
 			</combo_box>
 		</panel>
 		<panel label="Attributs" name="Features">
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
index 56cb654440..92ee6ecf24 100644
--- a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
@@ -12,6 +12,114 @@
 	<string name="new_voice_effect">
 		(Nouveau !)
 	</string>
+	<string name="effect_Arena">
+		Stade
+	</string>
+	<string name="effect_Beast">
+		Brute
+	</string>
+	<string name="effect_Buff">
+		Nasal
+	</string>
+	<string name="effect_Buzz">
+		Friture
+	</string>
+	<string name="effect_Camille">
+		Camille
+	</string>
+	<string name="effect_Creepy">
+		Effrayant
+	</string>
+	<string name="effect_CreepyBot">
+		BotEffrayant
+	</string>
+	<string name="effect_Cyber">
+		Cyber
+	</string>
+	<string name="effect_DeepBot">
+		BotGrave
+	</string>
+	<string name="effect_Demon">
+		Démon
+	</string>
+	<string name="effect_Flirty">
+		Flirt
+	</string>
+	<string name="effect_Foxy">
+		Séduction
+	</string>
+	<string name="effect_Halloween_2010_Bonus">
+		Halloween_2010_Bonus
+	</string>
+	<string name="effect_Helium">
+		Hélium
+	</string>
+	<string name="effect_Husky">
+		Rauque
+	</string>
+	<string name="effect_Intercom">
+		Interphone
+	</string>
+	<string name="effect_Macho">
+		Macho
+	</string>
+	<string name="effect_Micro">
+		Micro
+	</string>
+	<string name="effect_Mini">
+		Mini
+	</string>
+	<string name="effect_Nano">
+		Nano
+	</string>
+	<string name="effect_Nightmare">
+		Cauchemar
+	</string>
+	<string name="effect_PopBot">
+		BotPop
+	</string>
+	<string name="effect_Rachel">
+		Rachel
+	</string>
+	<string name="effect_Radio">
+		Radio
+	</string>
+	<string name="effect_Robot">
+		Robot
+	</string>
+	<string name="effect_Roxanne">
+		Roxanne
+	</string>
+	<string name="effect_Sabrina">
+		Sabrina
+	</string>
+	<string name="effect_Samantha">
+		Samantha
+	</string>
+	<string name="effect_Sexy">
+		Sexy
+	</string>
+	<string name="effect_Shorty">
+		Petite voix
+	</string>
+	<string name="effect_Sneaky">
+		Sournois
+	</string>
+	<string name="effect_Stallion">
+		Étalon
+	</string>
+	<string name="effect_Sultry">
+		Sensuel
+	</string>
+	<string name="effect_Thunder">
+		Tonnerre
+	</string>
+	<string name="effect_Vixen">
+		Mégère
+	</string>
+	<string name="effect_WhinyBot">
+		BotPleurnichard
+	</string>
 	<text name="preview_text">
 		Aperçu
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 52b8e8569a..dd8fdaf50e 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -2057,13 +2057,14 @@ Liez-la à partir d&apos;une page web pour permettre aux autres résidents d&apo
 		<usetemplate ignoretext="Porter automatiquement tout en modifiant mon apparence" name="okcancelignore" notext="Non" yestext="Oui"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Pour pouvoir pénétrer dans cette zone, vous devez avoir procédé à la vérification de votre âge.  Souhaitez-vous aller sur [SECOND_LIFE] et procéder à la vérification de votre âge ?
+		Vous devez avoir au moins 18 ans pour accéder au contenu et aux zones Adulte dans Second Life. Visitez la page de vérification de l&apos;âge afin de confirmer que vous avez plus de 18 ans. 
+Cette opération lancera votre navigateur Web.
 
 [_URL]
 		<url name="url" option="0">
-			https://secondlife.com/account/verification.php?lang=fr
+			https://secondlife.com/my/account/verification.php
 		</url>
-		<usetemplate ignoretext="Je n&apos;ai pas procédé à la vérification de mon âge" name="okcancelignore" notext="Non" yestext="Oui"/>
+		<usetemplate ignoretext="Je n&apos;ai pas procédé à la vérification de mon âge" name="okcancelignore" notext="Annuler" yestext="Accéder à la page de vérification de l&apos;âge"/>
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Pour pouvoir pénétrer dans cette zone, vous devez avoir enregistré vos informations de paiement.  Souhaitez-vous aller sur [SECOND_LIFE] et enregistrer vos informations de paiement ?
@@ -2754,6 +2755,12 @@ Le bouton sera affiché quand il y aura suffisamment de place.
 
 Voir le fichier journal pour plus de détails.
 	</notification>
+	<notification name="MeshUploadPermError">
+		Erreur lors de la demande des autorisations de chargement de maillage.
+	</notification>
+	<notification name="RegionCapabilityRequestError">
+		Impossible d&apos;obtenir la capacité de région : [CAPABILITY].
+	</notification>
 	<notification name="ShareItemsConfirmation">
 		Voulez-vous vraiment partager les articles suivants :
 
diff --git a/indra/newview/skins/default/xui/fr/panel_places.xml b/indra/newview/skins/default/xui/fr/panel_places.xml
index 509d167704..5ec48c44c7 100644
--- a/indra/newview/skins/default/xui/fr/panel_places.xml
+++ b/indra/newview/skins/default/xui/fr/panel_places.xml
@@ -26,7 +26,7 @@
 				</layout_stack>
 				<layout_stack name="bottom_bar_profile_ls">
 					<layout_panel name="profile_btn_lp">
-						<button label="Profil" name="profile_btn" tool_tip="Afficher le profil de l&apos;endroit"/>
+						<button label="Profil" name="profile_btn" tool_tip="Afficher le profil de l&apos;endroit."/>
 					</layout_panel>
 				</layout_stack>
 				<layout_stack name="bottom_bar_close_ls3">
diff --git a/indra/newview/skins/default/xui/fr/panel_sound_devices.xml b/indra/newview/skins/default/xui/fr/panel_sound_devices.xml
index a9802312dc..460b269f7c 100644
--- a/indra/newview/skins/default/xui/fr/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/fr/panel_sound_devices.xml
@@ -3,9 +3,18 @@
 	<panel.string name="default_text">
 		Valeur par défaut
 	</panel.string>
+	<string name="name_no_device">
+		Aucun périphérique
+	</string>
+	<string name="name_default_system_device">
+		Périphérique système par défaut
+	</string>
 	<text name="Input">
 		Entrée
 	</text>
+	<text name="Output">
+		Sortie
+	</text>
 	<text name="My volume label">
 		Mon volume :
 	</text>
@@ -13,7 +22,4 @@
 	<text name="wait_text">
 		Veuillez patienter
 	</text>
-	<text name="Output">
-		Sortie
-	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 134ea0c6bb..e6d407f727 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -34,6 +34,9 @@
 	<string name="StartupInitializingVFS">
 		Initialisation VFS...
 	</string>
+	<string name="StartupRequireDriverUpdate">
+		Échec d&apos;initialisation des graphiques. Veuillez mettre votre pilote graphique à jour.
+	</string>
 	<string name="ProgressRestoring">
 		Restauration...
 	</string>
@@ -91,6 +94,12 @@
 	<string name="LoginQuicktimeOK">
 		Initialisation de Quicktime réussie.
 	</string>
+	<string name="LoginRequestSeedCapGrant">
+		Capacités de la région demandées...
+	</string>
+	<string name="LoginRetrySeedCapGrant">
+		Capacités de la région demandées... Tentative n° [NUMBER].
+	</string>
 	<string name="LoginWaitingForRegionHandshake">
 		Liaison avec la région en cours de création...
 	</string>
@@ -1640,6 +1649,9 @@ Veuillez réessayer de vous connecter dans une minute.
 	</string>
 	<string name="SummaryForTheWeek" value="Récapitulatif de la semaine, début le "/>
 	<string name="NextStipendDay" value=". Prochaine prime le "/>
+	<string name="GroupPlanningDate">
+		[day,datetime,utc]/[mthnum,datetime,utc]/[year,datetime,utc]
+	</string>
 	<string name="GroupIndividualShare" value="                      Groupe    Part individuelle"/>
 	<string name="GroupColumn" value="Groupe"/>
 	<string name="Balance">
@@ -1969,6 +1981,9 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="GroupMoneyDebits">
 		Débits
 	</string>
+	<string name="GroupMoneyDate">
+		[weekday,datetime,utc] [day,datetime,utc] [mth,datetime,utc] [year,datetime,utc]
+	</string>
 	<string name="ViewerObjectContents">
 		Contenus
 	</string>
@@ -4170,6 +4185,87 @@ de l&apos;infraction signalée
 	<string name="Female - Wow">
 		Femme - Ouah !
 	</string>
+	<string name="/bow">
+		/s&apos;incliner
+	</string>
+	<string name="/clap">
+		/applaudir
+	</string>
+	<string name="/count">
+		/compter
+	</string>
+	<string name="/extinguish">
+		/éteindre
+	</string>
+	<string name="/kmb">
+		/vatefairevoir
+	</string>
+	<string name="/muscle">
+		/montrersesmuscles
+	</string>
+	<string name="/no">
+		/non
+	</string>
+	<string name="/no!">
+		/non !
+	</string>
+	<string name="/paper">
+		/papier
+	</string>
+	<string name="/pointme">
+		/memontrerdudoigt
+	</string>
+	<string name="/pointyou">
+		/montrerl&apos;autredudoigt
+	</string>
+	<string name="/rock">
+		/pierre
+	</string>
+	<string name="/scissor">
+		/ciseaux
+	</string>
+	<string name="/smoke">
+		/fumer
+	</string>
+	<string name="/stretch">
+		/s&apos;étirer
+	</string>
+	<string name="/whistle">
+		/siffler
+	</string>
+	<string name="/yes">
+		/oui
+	</string>
+	<string name="/yes!">
+		/oui !
+	</string>
+	<string name="afk">
+		absent
+	</string>
+	<string name="dance1">
+		danse1
+	</string>
+	<string name="dance2">
+		danse2
+	</string>
+	<string name="dance3">
+		danse3
+	</string>
+	<string name="dance4">
+		danse4
+	</string>
+	<string name="dance5">
+		danse5
+	</string>
+	<string name="dance6">
+		danse6
+	</string>
+	<string name="dance7">
+		danse7
+	</string>
+	<string name="dance8">
+		danse8
+	</string>
 	<string name="AvatarBirthDateFormat">
 		[day,datetime,slt]/[mthnum,datetime,slt]/[year,datetime,slt]
 	</string>
diff --git a/indra/newview/skins/default/xui/it/floater_build_options.xml b/indra/newview/skins/default/xui/it/floater_build_options.xml
index 326aab1a31..080e396642 100644
--- a/indra/newview/skins/default/xui/it/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/it/floater_build_options.xml
@@ -1,7 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="OPZIONI DELLA GRIGLIA">
-	<spinner label="Unità griglia (metri)" label_width="192" name="GridResolution" width="250"/>
-	<spinner label="Estensione della griglia (metri)" label_width="192" name="GridDrawSize" width="250"/>
+	<floater.string name="grid_screen_text">
+		Schermo
+	</floater.string>
+	<floater.string name="grid_local_text">
+		Locale
+	</floater.string>
+	<floater.string name="grid_world_text">
+		Mondo
+	</floater.string>
+	<floater.string name="grid_reference_text">
+		Riferimento
+	</floater.string>
+	<floater.string name="grid_attachment_text">
+		Allegato
+	</floater.string>
+	<text name="grid_mode_label" tool_tip="Opacità della griglia">
+		Modalità
+	</text>
+	<combo_box name="combobox grid mode" tool_tip="Scegli il tipo di righello per posizionare l&apos;oggetto">
+		<combo_box.item label="Griglia del mondo" name="World"/>
+		<combo_box.item label="Griglia locale" name="Local"/>
+		<combo_box.item label="Griglia di riferimento" name="Reference"/>
+	</combo_box>
+	<spinner label="Unità (metri)" label_width="192" name="GridResolution" width="250"/>
+	<spinner label="Ampiezza (metri)" label_width="192" name="GridDrawSize" width="250"/>
 	<check_box label="Usa sottounità" name="GridSubUnit"/>
 	<check_box label="Guarda le sezioni trasversali" name="GridCrossSection"/>
 	<text name="grid_opacity_label" tool_tip="Opacità della griglia">
diff --git a/indra/newview/skins/default/xui/it/floater_model_preview.xml b/indra/newview/skins/default/xui/it/floater_model_preview.xml
index 69245f0755..931fe7d382 100644
--- a/indra/newview/skins/default/xui/it/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/it/floater_model_preview.xml
@@ -60,6 +60,9 @@
 	<string name="simplifying">
 		Semplificazione in corso...
 	</string>
+	<string name="tbd">
+		Da definire
+	</string>
 	<text name="name_label">
 		Nome:
 	</text>
@@ -80,23 +83,26 @@
 			Livello di dettaglio: Bassissimo
 		</combo_item>
 	</combo_box>
-	<panel>
-		<text name="streaming cost">
-			Costo risorsa: [COST]
-		</text>
-		<text name="physics cost">
-			Costo fisica: [COST]
-		</text>
-		<text name="upload fee">
-			Costo caricamento: N/D
-		</text>
-	</panel>
-	<text name="status">
-		[STATUS]
+	<text name="warning_title">
+		ATTENZIONE:
+	</text>
+	<text name="warning_message">
+		Non sarà possibile completare il caricamento finale di questo modello sui server di Second Life. [[VURL] Scopri come] ricevere l&apos;autorizzazione per il caricamento dei modelli con reticolo.
+	</text>
+	<text name="weights_text">
+		Download:
+Fisica:
+Server:
+
+Prim equivalenti:
+	</text>
+	<text name="weights">
+		[ST]
+[PH]
+[SIM]
+
+[EQ]
 	</text>
-	<button label="Predefiniti" name="reset_btn" tool_tip="Ripristina predefiniti"/>
-	<button label="Carica sul server" name="ok_btn" tool_tip="Carica al simulatore"/>
-	<button label="Annulla" name="cancel_btn"/>
 	<tab_container name="import_tab">
 		<panel label="Livello di dettaglio" name="lod_panel">
 			<text name="lod_table_header">
@@ -234,4 +240,11 @@
 			<spinner name="pelvis_offset" value="0.0"/>
 		</panel>
 	</tab_container>
+	<text name="upload_fee">
+		Costo caricamento: L$ [FEE]
+	</text>
+	<button label="Imposta sui valori predefiniti" name="reset_btn" tool_tip="Imposta sui valori predefiniti"/>
+	<button label="Calcolare pesi e tariffa" name="calculate_btn" tool_tip="Calcolare pesi e tariffa"/>
+	<button label="Carica sul server" name="ok_btn" tool_tip="Carica al simulatore"/>
+	<button label="Annulla" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_model_wizard.xml b/indra/newview/skins/default/xui/it/floater_model_wizard.xml
index 67ba452ce5..dbf41e2daf 100644
--- a/indra/newview/skins/default/xui/it/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/it/floater_model_wizard.xml
@@ -2,42 +2,54 @@
 <floater name="Model Wizard" title="PROCEDURA GUIDATA CARICA MODELLO">
 	<button label="5. Carica sul server" name="upload_btn"/>
 	<button label="4. Rivedi" name="review_btn"/>
-	<button label="3. Fisica" name="physics2_btn"/>
 	<button label="3. Fisica" name="physics_btn"/>
 	<button label="2. Ottimizza" name="optimize_btn"/>
 	<button label="1. Seleziona file" name="choose_file_btn"/>
 	<panel name="choose_file_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Carica modello
+		<panel name="choose_file_header_panel">
+			<text name="choose_file_header_text">
+				Seleziona file modello
 			</text>
 		</panel>
-		<text name="description">
-			Questa procedura guidata permette di importare modelli di reticoli in Second Life.  Specificare prima un  file che contiene il modello da importare.  Second Life supporta file COLLADA (.dae).
-		</text>
-		<panel name="content">
-			<text name="Cache location">
-				Nome file:
+		<panel name="choose_file_content_panel">
+			<text name="advanced_users_text">
+				Utenti avanzati: Gli utenti che hanno dimestichezza con gli strumenti di creazione 3D possono usare le opzioni di caricamento avanzate.
+			</text>
+			<button label="Passa a modalità avanzata" name="switch_to_advanced"/>
+			<text name="choose_model_file_label">
+				Scegli il file del modello da caricare
 			</text>
 			<button label="Sfoglia..." label_selected="Sfoglia..." name="browse"/>
+			<text name="support_collada_text">
+				Second Life supporta file COLLADA (.dae)
+			</text>
+			<text name="dimensions_label">
+				Dimensioni (metri):
+			</text>
 			<text name="dimensions">
-				X:         Y:         Z:
+				X         Y         Z
+			</text>
+			<text name="warning_label">
+				ATTENZIONE:
 			</text>
-			<text name="dimension_dividers">
-				|               |
+			<text name="warning_text">
+				Non sarà possibile completare il passaggio finale per il caricamento finale di questo modello sui server di Second Life. [secondlife:///app/floater/learn_more Scopri come] impostare l&apos;account per il caricamento di modelli con reticolo.
 			</text>
 		</panel>
 	</panel>
 	<panel name="optimize_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Ottimizza
+		<panel name="optimize_header_panel">
+			<text name="optimize_header_text">
+				Ottimizza modello
 			</text>
 		</panel>
-		<text name="description">
-			Questa procedura guidata ha ottimizzato il modello per migliorare le prestazioni. Si possono variare i risultati dell&apos;ottimizzazione in basso o fare clic su Avanti per continuare.
+		<text name="optimize_hint">
+			Abbiamo ottimizzato il modello per migliorare le prestazioni. Se necessario, può essere regolato ulteriormente.
 		</text>
-		<panel name="content">
+		<panel name="optimize_content_panel">
+			<text name="generating_lod_label">
+				Generazione livello di dettaglio
+			</text>
 			<text name="high_detail_text">
 				Genera livello di dettaglio: Alto
 			</text>
@@ -52,140 +64,154 @@
 			</text>
 		</panel>
 		<panel name="content2">
-			<text name="lod_label">
-				Anteprima modello:
+			<text name="optimize_performance_text">
+				Prestazioni
 			</text>
-			<combo_box name="preview_lod_combo2" tool_tip="Livello di dettaglio per anteprima rendering">
-				<combo_item name="high">
-					Alto
+			<text name="optimize_faster_rendering_text">
+				Rendering più veloce
+Meno dettagli
+Peso prim più basso
+			</text>
+			<text name="optimize_accuracy_text">
+				Fedeltà
+			</text>
+			<text name="optimize_slower_rendering_text">
+				Rendering più lento
+Più dettagli
+Peso prim più elevato
+			</text>
+			<text name="accuracy_slider_mark1">
+				&apos;
+			</text>
+			<text name="accuracy_slider_mark2">
+				&apos;
+			</text>
+			<text name="accuracy_slider_mark3">
+				&apos;
+			</text>
+			<button label="Ricalcola geometria" name="recalculate_geometry_btn"/>
+			<text name="geometry_preview_label">
+				Anteprima geometria
+			</text>
+			<combo_box name="preview_lod_combo" tool_tip="Livello di dettaglio per anteprima rendering">
+				<combo_item name="preview_lod_high">
+					Molti dettagli
 				</combo_item>
-				<combo_item name="medium">
-					Medio
+				<combo_item name="preview_lod_medium">
+					Dettagli medi
 				</combo_item>
-				<combo_item name="low">
-					Basso
+				<combo_item name="preview_lod_low">
+					Meno dettagli
 				</combo_item>
-				<combo_item name="lowest">
-					Bassissimo
+				<combo_item name="preview_lod_lowest">
+					Dettaglio minimo
 				</combo_item>
 			</combo_box>
-			<text name="streaming cost">
-				Costo risorsa:    [COST]
-			</text>
-			<text name="dimensions">
-				X:         Y:         Z:
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
 		</panel>
 	</panel>
 	<panel name="physics_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Fisica
+		<panel name="physics_header_panel">
+			<text name="physics_header_text">
+				Modifica fisica
 			</text>
 		</panel>
-		<text name="description">
-			La procedura guidata permette di creare una forma fisica che determina come l&apos;oggetto interagisce con altri oggetti e avatar. Impostare il comando a scorrimento sul livello di dettaglio appropriato per l&apos;uso dell&apos;oggetto:
+		<text name="physics_hint">
+			Verrà creata una forma per lo scafo esterno del modello. Regola il livello di dettaglio della forma in base al fine desiderato del modello.
 		</text>
-		<panel name="content">
-			<text name="streaming cost">
-				Costo risorsa:       [COST]
+		<panel name="physics_content_panel">
+			<text name="physics_performance_text">
+				Prestazioni
 			</text>
-		</panel>
-	</panel>
-	<panel name="physics2_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Fisica
+			<text name="physics_faster_rendering_text">
+				Rendering più veloce
+Meno dettagli
+Peso prim più basso
 			</text>
-		</panel>
-		<text name="description">
-			Visualizza in anteprima la forma fisica in basso, quindi fai clic su Avanti per continuare.  Per modificare la forma fisica, fare clic su Indietro.
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				Anteprima modello:
+			<text name="physics_accuracy_text">
+				Fedeltà
 			</text>
-			<combo_box name="preview_lod_combo3" tool_tip="Livello di dettaglio per anteprima rendering">
-				<combo_item name="high">
-					Alto
+			<text name="physics_slower_dendering_text">
+				Rendering più lento
+Più dettagli
+Peso prim più elevato
+			</text>
+			<text name="physics_example_1">
+				Esempi:
+Oggetti in movimento
+Oggetti in volo
+Veicoli
+			</text>
+			<text name="physics_example_2">
+				Esempi:
+Piccoli oggetti statici
+Oggetti meno dettagliati
+Mobili semplici
+			</text>
+			<text name="physics_example_3">
+				Esempi:
+Oggetti statici
+Oggetti dettagliati
+Edifici
+			</text>
+			<button label="Ricalcola fisica" name="recalculate_physics_btn"/>
+			<button label="Ricalcolo in corso..." name="recalculating_physics_btn"/>
+			<text name="physics_preview_label">
+				Anteprima fisica
+			</text>
+			<combo_box name="preview_lod_combo2" tool_tip="Livello di dettaglio per anteprima rendering">
+				<combo_item name="preview_lod2_high">
+					Molti dettagli
 				</combo_item>
-				<combo_item name="medium">
-					Medio
+				<combo_item name="preview_lod2_medium">
+					Dettagli medi
 				</combo_item>
-				<combo_item name="low">
-					Basso
+				<combo_item name="preview_lod2_low">
+					Meno dettagli
 				</combo_item>
-				<combo_item name="lowest">
-					Bassissimo
+				<combo_item name="preview_lod2_lowest">
+					Dettaglio minimo
 				</combo_item>
 			</combo_box>
-			<text name="dimensions">
-				X:         Y:         Z:
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
-			<text name="streaming cost">
-				Costo risorsa:       [COST]
-			</text>
 		</panel>
 	</panel>
 	<panel name="review_panel">
-		<panel name="header_panel">
-			<text name="header_text">
+		<panel name="review_header_panel">
+			<text name="review_header_text">
 				Rivedi
 			</text>
 		</panel>
-		<text name="description">
-			Rivedere i dettagli in basso, quindi fare clic su Carica per caricare il modello. Il tuo saldo in L$ verrà addebitato quando fai clic su Carica.
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				Anteprima modello:
+		<panel name="review_content_panel">
+			<text name="review_prim_equiv">
+				Impatto sul lotto o sulla regione: [EQUIV] prim equivalenti
 			</text>
-			<combo_box name="preview_lod_combo" tool_tip="Livello di dettaglio per anteprima rendering">
-				<combo_item name="high">
-					Alto
-				</combo_item>
-				<combo_item name="medium">
-					Medio
-				</combo_item>
-				<combo_item name="low">
-					Basso
-				</combo_item>
-				<combo_item name="lowest">
-					Bassissimo
-				</combo_item>
-			</combo_box>
-			<text name="dimensions">
-				X:         Y:         Z:
+			<text name="review_fee">
+				All&apos;account verrà accreditata una tariffa di caricamento pari a L$ [FEE].
 			</text>
-			<text name="dimension_dividers">
-				|               |
+			<text name="review_confirmation">
+				Facendo clic sul pulsante Carica, confermi di possedere i diritti relativi ai materiali contenuti nel modello.
 			</text>
 		</panel>
-		<text name="streaming cost">
-			Costo risorsa:         [COST]
-		</text>
-		<text name="physics cost">
-			Costo fisica:        [COST]
-		</text>
 	</panel>
 	<panel name="upload_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Caricamento completato.
+		<panel name="upload_header_panel">
+			<text name="upload_header_text">
+				Caricamento completato
 			</text>
 		</panel>
-		<text name="description">
-			Congratulazioni. Il modello è stato caricato correttamente  e ora puoi trovarlo nella cartella Oggetti nel tuo inventario.
+		<text name="model_uploaded_text">
+			Il modello è stato caricato.
+		</text>
+		<text name="inventory_text">
+			Puoi trovarlo nella cartella Oggetti nel tuo inventario.
+		</text>
+		<text name="charged_fee">
+			La somma di L$ [FEE] è stata addebitata sul tuo account.
 		</text>
 	</panel>
 	<button label="&lt;&lt; Indietro" name="back"/>
 	<button label="Avanti &gt;&gt;" name="next"/>
+	<button label="Calcolare pesi e tariffa &gt;&gt;" name="calculate"/>
+	<button label="Calcolo in corso..." name="calculating"/>
 	<button label="Carica" name="upload" tool_tip="Carica al simulatore"/>
 	<button label="Annulla" name="cancel"/>
 	<button label="Chiudi" name="close"/>
diff --git a/indra/newview/skins/default/xui/it/floater_search.xml b/indra/newview/skins/default/xui/it/floater_search.xml
index 05f5dfe719..ac3dc17aa3 100644
--- a/indra/newview/skins/default/xui/it/floater_search.xml
+++ b/indra/newview/skins/default/xui/it/floater_search.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="TROVA">
+<floater name="floater_search" title="">
 	<floater.string name="loading_text">
 		Caricamento in corso...
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml
index f7c83c9e0f..d3b1503742 100644
--- a/indra/newview/skins/default/xui/it/floater_tools.xml
+++ b/indra/newview/skins/default/xui/it/floater_tools.xml
@@ -24,20 +24,11 @@
 	<floater.string name="status_selectland">
 		Clicca e trascina per selezionare il terreno
 	</floater.string>
-	<floater.string name="grid_screen_text">
-		Schermo
+	<floater.string name="status_selectcount">
+		[OBJ_COUNT] oggetti ( [PRIM_COUNT] prim [PE_STRING] ) selezionati
 	</floater.string>
-	<floater.string name="grid_local_text">
-		Locale
-	</floater.string>
-	<floater.string name="grid_world_text">
-		Globale
-	</floater.string>
-	<floater.string name="grid_reference_text">
-		Riferimento
-	</floater.string>
-	<floater.string name="grid_attachment_text">
-		Accessorio
+	<floater.string name="status_selectprimequiv">
+		, [SEL_WEIGHT] prim equivalenti
 	</floater.string>
 	<button label="" label_selected="" name="button focus" tool_tip="Ingrandisci"/>
 	<button label="" label_selected="" name="button move" tool_tip="Sposta"/>
@@ -66,20 +57,12 @@
 	<check_box label="Modifica parti collegate" name="checkbox edit linked parts"/>
 	<button label="Collegamento" name="link_btn"/>
 	<button label="Scollega" name="unlink_btn"/>
-	<text name="RenderingCost" tool_tip="Mostra il costo di rendering calcolato per questo oggetto">
-		þ: [COUNT]
-	</text>
 	<check_box label="" name="checkbox uniform"/>
 	<text label="Allunga entrambi i lati" name="checkbox uniform label">
 		Allunga entrambi i lati
 	</text>
 	<check_box initial_value="true" label="Ridimensiona le texture" name="checkbox stretch textures"/>
-	<check_box initial_value="true" label="Posiziona nella griglia" name="checkbox snap to grid"/>
-	<combo_box name="combobox grid mode" tool_tip="Scegli il tipo di righello per posizionare l&apos;oggetto">
-		<combo_box.item label="Rete del mondo" name="World"/>
-		<combo_box.item label="Rete locale" name="Local"/>
-		<combo_box.item label="Griglia di riferimento" name="Reference"/>
-	</combo_box>
+	<check_box initial_value="true" label="Scatto" name="checkbox snap to grid"/>
 	<button label="Opzioni..." label_selected="Opzioni..." name="Options..." tool_tip="Vedi più opzioni della griglia"/>
 	<button label="" label_selected="" name="ToolCube" tool_tip="Cubo"/>
 	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/>
@@ -120,23 +103,11 @@
 		Potenza
 	</text>
 	<button label="Applica" label_selected="Applica" name="button apply to selection" tool_tip="Modifica il terreno selezionato"/>
-	<text name="obj_count">
-		Oggetti: [COUNT]
-	</text>
-	<text name="prim_count">
-		Prim: [COUNT]
-	</text>
-	<text name="linked_set_count">
-		Set collegati: [COUNT]
-	</text>
-	<text name="linked_set_cost" tool_tip="Costo dei set collegati attualmente selezionati come [prim],[complessità fisica]">
-		Costo: [COST] / [PHYSICS]
-	</text>
-	<text name="object_count">
-		Oggetti: [COUNT]
+	<text name="selection_empty">
+		Nessuna selezione.
 	</text>
-	<text name="object_cost" tool_tip="Costo degli oggetti attualmente selezionati come [prim] / [complessità fisica]">
-		Costo: [COST] / [PHYSICS]
+	<text name="selection_weight">
+		Peso fisica [PHYS_WEIGHT], costo rendering [DISP_WEIGHT].
 	</text>
 	<tab_container name="Object Info Tabs">
 		<panel label="Generale" name="General">
@@ -360,7 +331,6 @@
 				<combo_box.item label="Toroidale" name="Torus"/>
 				<combo_box.item label="Piana" name="Plane"/>
 				<combo_box.item label="Cilindrica" name="Cylinder"/>
-				<combo_box.item label="Reticolo" name="Mesh"/>
 			</combo_box>
 		</panel>
 		<panel label="Caratteristiche" name="Features">
diff --git a/indra/newview/skins/default/xui/it/floater_voice_effect.xml b/indra/newview/skins/default/xui/it/floater_voice_effect.xml
index 4c440c45b6..a0e49525ea 100644
--- a/indra/newview/skins/default/xui/it/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/it/floater_voice_effect.xml
@@ -12,6 +12,114 @@
 	<string name="new_voice_effect">
 		(Nuovo!)
 	</string>
+	<string name="effect_Arena">
+		Arena
+	</string>
+	<string name="effect_Beast">
+		Bestia
+	</string>
+	<string name="effect_Buff">
+		Appassionato
+	</string>
+	<string name="effect_Buzz">
+		Euforia
+	</string>
+	<string name="effect_Camille">
+		Camilla
+	</string>
+	<string name="effect_Creepy">
+		Terrificante
+	</string>
+	<string name="effect_CreepyBot">
+		TerrificanteBot
+	</string>
+	<string name="effect_Cyber">
+		Cyber
+	</string>
+	<string name="effect_DeepBot">
+		ProfondoBot
+	</string>
+	<string name="effect_Demon">
+		Demonio
+	</string>
+	<string name="effect_Flirty">
+		Civettuolo
+	</string>
+	<string name="effect_Foxy">
+		Scaltro
+	</string>
+	<string name="effect_Halloween_2010_Bonus">
+		Halloween_2010_Bonus
+	</string>
+	<string name="effect_Helium">
+		Elio
+	</string>
+	<string name="effect_Husky">
+		Fusto
+	</string>
+	<string name="effect_Intercom">
+		Interfono
+	</string>
+	<string name="effect_Macho">
+		Macho
+	</string>
+	<string name="effect_Micro">
+		Micro
+	</string>
+	<string name="effect_Mini">
+		Mini
+	</string>
+	<string name="effect_Nano">
+		Nano
+	</string>
+	<string name="effect_Nightmare">
+		Incubo
+	</string>
+	<string name="effect_PopBot">
+		PopBot
+	</string>
+	<string name="effect_Rachel">
+		Rachele
+	</string>
+	<string name="effect_Radio">
+		Radio
+	</string>
+	<string name="effect_Robot">
+		Robot
+	</string>
+	<string name="effect_Roxanne">
+		Rosanna
+	</string>
+	<string name="effect_Sabrina">
+		Sabrina
+	</string>
+	<string name="effect_Samantha">
+		Samanta
+	</string>
+	<string name="effect_Sexy">
+		Sexy
+	</string>
+	<string name="effect_Shorty">
+		Bassotto
+	</string>
+	<string name="effect_Sneaky">
+		Vile
+	</string>
+	<string name="effect_Stallion">
+		Stallone
+	</string>
+	<string name="effect_Sultry">
+		Focoso
+	</string>
+	<string name="effect_Thunder">
+		Tuono
+	</string>
+	<string name="effect_Vixen">
+		Maliziosa
+	</string>
+	<string name="effect_WhinyBot">
+		PiangiBot
+	</string>
 	<text name="preview_text">
 		Per l&apos;anteprima
 	</text>
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 2d5c8e3522..88625ef4b7 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -2063,13 +2063,14 @@ Inseriscilo in una pagina web per dare ad altri un accesso facile a questa ubica
 		<usetemplate ignoretext="Indossare gli abiti che creo mentre modifico il mio aspetto" name="okcancelignore" notext="No" yestext="Si"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Per entrare in questa zona, devi avere eseguito la verifica dell&apos;età.  Vuoi andare sul sito di [SECOND_LIFE] per verificare la tua età?
+		Per accedere ai contenuti e alle aree per adulti in Second Life devi avere almeno 18 anni. Visita la pagina di verifica dell&apos;età per confermare di avere almeno 18 anni. 
+Verrà avviato il browser Web.
 
 [_URL]
 		<url name="url" option="0">
-			https://secondlife.com/account/verification.php?lang=it
+			https://secondlife.com/my/account/verification.php
 		</url>
-		<usetemplate ignoretext="Non ho verificato la mia età" name="okcancelignore" notext="No" yestext="Si"/>
+		<usetemplate ignoretext="Non ho verificato la mia età" name="okcancelignore" notext="Annulla" yestext="Passa alla verifica dell&apos;età"/>
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Per poter visitare questa zona devi avere devi aver fornito informazioni di pagamento a Linden Lab.  Vuoi andare sul sito di [SECOND_LIFE] ed impostarle?
@@ -2756,6 +2757,12 @@ Il pulsante verrà visualizzato quando lo spazio sarà sufficiente.
 
 Per informazioni dettagliate, vedi il file del registro.
 	</notification>
+	<notification name="MeshUploadPermError">
+		Errore durante la richiesta di autorizzazione al caricamento del reticolo.
+	</notification>
+	<notification name="RegionCapabilityRequestError">
+		Non è stata ottenuta la capacità della regione &apos;[CAPABILITY]&apos;.
+	</notification>
 	<notification name="ShareItemsConfirmation">
 		Sei sicuro di volere condividere gli oggetti
 
diff --git a/indra/newview/skins/default/xui/it/panel_sound_devices.xml b/indra/newview/skins/default/xui/it/panel_sound_devices.xml
index 8e7f0c8dc5..b1934fd515 100644
--- a/indra/newview/skins/default/xui/it/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/it/panel_sound_devices.xml
@@ -3,9 +3,18 @@
 	<panel.string name="default_text">
 		Predefinito
 	</panel.string>
+	<string name="name_no_device">
+		Nessun dispositivo
+	</string>
+	<string name="name_default_system_device">
+		Dispositivo di sistema predefinito
+	</string>
 	<text name="Input">
 		Input
 	</text>
+	<text name="Output">
+		Output
+	</text>
 	<text name="My volume label">
 		Il mio volume:
 	</text>
@@ -13,7 +22,4 @@
 	<text name="wait_text">
 		Attendi
 	</text>
-	<text name="Output">
-		Output
-	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 36a2d07409..1d335e55a6 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -31,6 +31,9 @@
 	<string name="StartupInitializingVFS">
 		Inizializzazione VFS...
 	</string>
+	<string name="StartupRequireDriverUpdate">
+		Inizializzazione grafica non riuscita. Aggiorna il driver della scheda grafica!
+	</string>
 	<string name="ProgressRestoring">
 		Ripristino in corso...
 	</string>
@@ -85,6 +88,12 @@
 	<string name="LoginQuicktimeOK">
 		QuickTime configurato con successo.
 	</string>
+	<string name="LoginRequestSeedCapGrant">
+		Richiesta capacità regione...
+	</string>
+	<string name="LoginRetrySeedCapGrant">
+		Richiesta capacità regione, tentativo [NUMBER]...
+	</string>
 	<string name="LoginWaitingForRegionHandshake">
 		In attesa della risposta della regione...
 	</string>
@@ -1619,6 +1628,9 @@ Prova ad accedere nuovamente tra un minuto.
 	</string>
 	<string name="SummaryForTheWeek" value="Riassunto della settimana, partendo dal "/>
 	<string name="NextStipendDay" value=". Il prossimo giorno di stipendio è "/>
+	<string name="GroupPlanningDate">
+		[mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc]
+	</string>
 	<string name="GroupIndividualShare" value="Gruppo       Dividendi individuali"/>
 	<string name="GroupColumn" value="Gruppo"/>
 	<string name="Balance">
@@ -1942,6 +1954,9 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="GroupMoneyDebits">
 		Debiti
 	</string>
+	<string name="GroupMoneyDate">
+		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
+	</string>
 	<string name="ViewerObjectContents">
 		Contenuto
 	</string>
@@ -4074,6 +4089,87 @@ Segnala abuso
 	<string name="Female - Wow">
 		Femmina - Accipicchia
 	</string>
+	<string name="/bow">
+		/inchino
+	</string>
+	<string name="/clap">
+		/applausi
+	</string>
+	<string name="/count">
+		/numero
+	</string>
+	<string name="/extinguish">
+		/estingui
+	</string>
+	<string name="/kmb">
+		/chissene
+	</string>
+	<string name="/muscle">
+		/muscolo
+	</string>
+	<string name="/no">
+		/no
+	</string>
+	<string name="/no!">
+		/no!
+	</string>
+	<string name="/paper">
+		/carta
+	</string>
+	<string name="/pointme">
+		/indicome
+	</string>
+	<string name="/pointyou">
+		/indicotu
+	</string>
+	<string name="/rock">
+		/sasso
+	</string>
+	<string name="/scissor">
+		/forbici
+	</string>
+	<string name="/smoke">
+		/fumo
+	</string>
+	<string name="/stretch">
+		/stiracchiata
+	</string>
+	<string name="/whistle">
+		/fischietto
+	</string>
+	<string name="/yes">
+		/si
+	</string>
+	<string name="/yes!">
+		/si!
+	</string>
+	<string name="afk">
+		non alla tastiera
+	</string>
+	<string name="dance1">
+		danza1
+	</string>
+	<string name="dance2">
+		danza2
+	</string>
+	<string name="dance3">
+		danza3
+	</string>
+	<string name="dance4">
+		danza4
+	</string>
+	<string name="dance5">
+		danza5
+	</string>
+	<string name="dance6">
+		danza6
+	</string>
+	<string name="dance7">
+		danza7
+	</string>
+	<string name="dance8">
+		danza8
+	</string>
 	<string name="AvatarBirthDateFormat">
 		[day,datetime,slt]/[mthnum,datetime,slt]/[year,datetime,slt]
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/floater_build_options.xml b/indra/newview/skins/default/xui/ja/floater_build_options.xml
index 8cb67ca521..6865409e7a 100644
--- a/indra/newview/skins/default/xui/ja/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/ja/floater_build_options.xml
@@ -1,7 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="グリッドオプション">
-	<spinner label="グリッド単位（メートル）" name="GridResolution"/>
-	<spinner label="グリッドﾞ範囲（メートル）" name="GridDrawSize"/>
+	<floater.string name="grid_screen_text">
+		画面
+	</floater.string>
+	<floater.string name="grid_local_text">
+		ローカル
+	</floater.string>
+	<floater.string name="grid_world_text">
+		世界
+	</floater.string>
+	<floater.string name="grid_reference_text">
+		リファレンス
+	</floater.string>
+	<floater.string name="grid_attachment_text">
+		アタッチメント
+	</floater.string>
+	<text name="grid_mode_label" tool_tip="グリッドの不透明度">
+		モード
+	</text>
+	<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>
+	<spinner label="単位（メートル）" name="GridResolution"/>
+	<spinner label="範囲（メートル）" name="GridDrawSize"/>
 	<check_box label="より細かい単位でスナップフィット" name="GridSubUnit"/>
 	<check_box label="横断面を表示" name="GridCrossSection"/>
 	<text name="grid_opacity_label" tool_tip="グリッドの不透明度">
diff --git a/indra/newview/skins/default/xui/ja/floater_model_preview.xml b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
index d0580b752c..07667bb697 100644
--- a/indra/newview/skins/default/xui/ja/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
@@ -60,6 +60,9 @@
 	<string name="simplifying">
 		単純化
 	</string>
+	<string name="tbd">
+		未定
+	</string>
 	<text name="name_label">
 		名前：
 	</text>
@@ -80,23 +83,26 @@
 			描画詳細度：最低
 		</combo_item>
 	</combo_box>
-	<panel>
-		<text name="streaming cost">
-			リソース料金： [COST]
-		</text>
-		<text name="physics cost">
-			物理効果料金： [COST]
-		</text>
-		<text name="upload fee">
-			アップロード手数料：該当なし
-		</text>
-	</panel>
-	<text name="status">
-		[STATUS]
+	<text name="warning_title">
+		警告：
+	</text>
+	<text name="warning_message">
+		このモデルを Second Life サーバーにアップロードすることはできません。メッシュモデルのアップロード手順については [[VURL] こちらを参照してください]。
+	</text>
+	<text name="weights_text">
+		ダウンロード：
+物理演算：
+サーバー負荷：
+
+プリム換算：
+	</text>
+	<text name="weights">
+		[ST]
+[PH]
+[SIM]
+
+[EQ]
 	</text>
-	<button label="デフォルト" name="reset_btn" tool_tip="デフォルトにリセット"/>
-	<button label="アップロード" name="ok_btn" tool_tip="シミュレーターにアップロード"/>
-	<button label="取り消し" name="cancel_btn"/>
 	<tab_container name="import_tab">
 		<panel label="描画詳細度" name="lod_panel">
 			<text name="lod_table_header">
@@ -234,4 +240,11 @@
 			<spinner name="pelvis_offset" value="0.0"/>
 		</panel>
 	</tab_container>
+	<text name="upload_fee">
+		アップロード料金：L$ [FEE]
+	</text>
+	<button label="デフォルトに設定" name="reset_btn" tool_tip="デフォルトに設定"/>
+	<button label="ウェイトと料金の計算" name="calculate_btn" tool_tip="ウェイトと料金の計算"/>
+	<button label="アップロード" name="ok_btn" tool_tip="シミュレーターにアップロード"/>
+	<button label="取り消し" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_model_wizard.xml b/indra/newview/skins/default/xui/ja/floater_model_wizard.xml
index 249d9f22b9..2f336fcbde 100644
--- a/indra/newview/skins/default/xui/ja/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/ja/floater_model_wizard.xml
@@ -2,42 +2,54 @@
 <floater name="Model Wizard" title="モデルウィザードをアップロード">
 	<button label="5. アップロード" name="upload_btn"/>
 	<button label="4. 確認" name="review_btn"/>
-	<button label="3. 物理効果" name="physics2_btn"/>
 	<button label="3. 物理効果" name="physics_btn"/>
 	<button label="2. 最適化" name="optimize_btn"/>
 	<button label="1. ファイルを選択" name="choose_file_btn"/>
 	<panel name="choose_file_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				モデルをアップロード
+		<panel name="choose_file_header_panel">
+			<text name="choose_file_header_text">
+				モデルファイルを選択
 			</text>
 		</panel>
-		<text name="description">
-			このウィザードを使うと、メッシュモデルを簡単にSecond Lifeにインポートできます。まず、インポートするモデルを含むファイルを指定します。Second Life は COLLADA (.dae) ファイルをサポートします。
-		</text>
-		<panel name="content">
-			<text name="Cache location">
-				ファイル名：
+		<panel name="choose_file_content_panel">
+			<text name="advanced_users_text">
+				上級ユーザーの場合：3D コンテンツの制作ツールを使い慣れた方は、高度なアップローダーもお試しください。
+			</text>
+			<button label="アドバンスモードに切り替える" name="switch_to_advanced"/>
+			<text name="choose_model_file_label">
+				アップロードするモデルファイルの選択
 			</text>
 			<button label="参照" label_selected="参照" name="browse"/>
+			<text name="support_collada_text">
+				Second Life は COLLADA (.dae) ファイルをサポートします。
+			</text>
+			<text name="dimensions_label">
+				サイズ（メートル）：
+			</text>
 			<text name="dimensions">
-				X:         Y:         Z:
+				X         Y         Z
+			</text>
+			<text name="warning_label">
+				警告：
 			</text>
-			<text name="dimension_dividers">
-				|               |
+			<text name="warning_text">
+				このモデルを Second Life サーバーにアップロードするための最終手順を実行できません。[secondlife:///app/floater/learn_more こちらを参照して]、メッシュモデルをアップロードできるようにアカウントを設定してください。
 			</text>
 		</panel>
 	</panel>
 	<panel name="optimize_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				最適化
+		<panel name="optimize_header_panel">
+			<text name="optimize_header_text">
+				モデルを最適化
 			</text>
 		</panel>
-		<text name="description">
-			ウィザードがモデルを最適化し、パフォーマンスを改善しました。以下で最適化プロセスの結果を変更するか、「次へ」をクリックして続けます。
+		<text name="optimize_hint">
+			パフォーマンスを重視してモデルを最適化しました。必要に応じて調整してください。
 		</text>
-		<panel name="content">
+		<panel name="optimize_content_panel">
+			<text name="generating_lod_label">
+				次の描画詳細度を作成
+			</text>
 			<text name="high_detail_text">
 				次の描画詳細度を作成：高
 			</text>
@@ -52,140 +64,154 @@
 			</text>
 		</panel>
 		<panel name="content2">
-			<text name="lod_label">
-				モデルのプレビュー：
+			<text name="optimize_performance_text">
+				パフォーマンス
+			</text>
+			<text name="optimize_faster_rendering_text">
+				レンダリング速度の向上
+詳細度の低下
+プリム換算ウェイトの軽減
+			</text>
+			<text name="optimize_accuracy_text">
+				正確さ
+			</text>
+			<text name="optimize_slower_rendering_text">
+				レンダリング速度の低下
+詳細化
+プリム換算ウェイトの増加
+			</text>
+			<text name="accuracy_slider_mark1">
+				&apos;
+			</text>
+			<text name="accuracy_slider_mark2">
+				&apos;
 			</text>
-			<combo_box name="preview_lod_combo2" tool_tip="プレビュー表示のLOD設定">
-				<combo_item name="high">
-					高
+			<text name="accuracy_slider_mark3">
+				&apos;
+			</text>
+			<button label="ジオメトリを再計算" name="recalculate_geometry_btn"/>
+			<text name="geometry_preview_label">
+				ジオメトリのプレビュー
+			</text>
+			<combo_box name="preview_lod_combo" tool_tip="プレビュー表示の LOD 設定">
+				<combo_item name="preview_lod_high">
+					高い詳細度
 				</combo_item>
-				<combo_item name="medium">
-					中
+				<combo_item name="preview_lod_medium">
+					中の詳細度
 				</combo_item>
-				<combo_item name="low">
-					低
+				<combo_item name="preview_lod_low">
+					低い詳細度
 				</combo_item>
-				<combo_item name="lowest">
-					最低
+				<combo_item name="preview_lod_lowest">
+					最低の詳細度
 				</combo_item>
 			</combo_box>
-			<text name="streaming cost">
-				リソース料金：    [COST]
-			</text>
-			<text name="dimensions">
-				X:         Y:         Z:
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
 		</panel>
 	</panel>
 	<panel name="physics_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				物理効果
+		<panel name="physics_header_panel">
+			<text name="physics_header_text">
+				物理作用の調整
 			</text>
 		</panel>
-		<text name="description">
-			ウィザードが作成する実像によって、オブジェクトが他のオブジェクトやアバターとどのようにインタラクションするかが決まります。オブジェクトの用途に最適な描画詳細度にスライダーを設定してください：
+		<text name="physics_hint">
+			モデルの外殻構造のシェイプは弊社が作成します。モデルの目的に応じてシェイプの詳細度を調整してください。
 		</text>
-		<panel name="content">
-			<text name="streaming cost">
-				リソース料金：       [COST]
+		<panel name="physics_content_panel">
+			<text name="physics_performance_text">
+				パフォーマンス
 			</text>
-		</panel>
-	</panel>
-	<panel name="physics2_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				物理効果
+			<text name="physics_faster_rendering_text">
+				レンダリング速度の向上
+詳細度の低下
+プリム換算ウェイトの軽減
 			</text>
-		</panel>
-		<text name="description">
-			下の実像をプレビューし、「次へ」をクリックして続けます。実像を修正するには「戻る」ボタンをクリックします。
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				モデルのプレビュー：
+			<text name="physics_accuracy_text">
+				正確
 			</text>
-			<combo_box name="preview_lod_combo3" tool_tip="プレビュー表示のLOD設定">
-				<combo_item name="high">
-					高
+			<text name="physics_slower_dendering_text">
+				レンダリング速度の低下
+詳細化
+プリム換算ウェイトの増加
+			</text>
+			<text name="physics_example_1">
+				例：
+動くオブジェクト
+飛行オブジェクト
+車
+			</text>
+			<text name="physics_example_2">
+				例：
+小さな静止オブジェクト
+比較的詳細度の低いオブジェクト
+シンプルな家具
+			</text>
+			<text name="physics_example_3">
+				例：
+静止オブジェクト
+詳細なオブジェクト
+建物
+			</text>
+			<button label="物理演算ウェイトを再計算" name="recalculate_physics_btn"/>
+			<button label="再計算中..." name="recalculating_physics_btn"/>
+			<text name="physics_preview_label">
+				物理作用のプレビュー
+			</text>
+			<combo_box name="preview_lod_combo2" tool_tip="プレビュー表示の LOD 設定">
+				<combo_item name="preview_lod2_high">
+					高い詳細度
 				</combo_item>
-				<combo_item name="medium">
-					中
+				<combo_item name="preview_lod2_medium">
+					中の詳細度
 				</combo_item>
-				<combo_item name="low">
-					低
+				<combo_item name="preview_lod2_low">
+					低い詳細度
 				</combo_item>
-				<combo_item name="lowest">
-					最低
+				<combo_item name="preview_lod2_lowest">
+					最低の詳細度
 				</combo_item>
 			</combo_box>
-			<text name="dimensions">
-				X:         Y:         Z:
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
-			<text name="streaming cost">
-				リソース料金：       [COST]
-			</text>
 		</panel>
 	</panel>
 	<panel name="review_panel">
-		<panel name="header_panel">
-			<text name="header_text">
+		<panel name="review_header_panel">
+			<text name="review_header_text">
 				確認
 			</text>
 		</panel>
-		<text name="description">
-			以下の詳細を確認してから、「アップロード」をクリックするとモデルがアップロードされます。「アップロード」をクリックした際に、料金があなたの L$ 残高から差し引かれます。
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				モデルのプレビュー：
+		<panel name="review_content_panel">
+			<text name="review_prim_equiv">
+				区画/リージョンへの負荷：[EQUIV] プリム換算値
 			</text>
-			<combo_box name="preview_lod_combo" tool_tip="プレビュー表示のLOD設定">
-				<combo_item name="high">
-					高
-				</combo_item>
-				<combo_item name="medium">
-					中
-				</combo_item>
-				<combo_item name="low">
-					低
-				</combo_item>
-				<combo_item name="lowest">
-					最低
-				</combo_item>
-			</combo_box>
-			<text name="dimensions">
-				X:         Y:         Z:
+			<text name="review_fee">
+				L$ [FEE] のアップロード料金があなたのアカウントに請求されます。
 			</text>
-			<text name="dimension_dividers">
-				|               |
+			<text name="review_confirmation">
+				アップロードボタンをクリックすると、モデルに含まれるマテリアルの所有権や使用許可を所持することを認めたことになります。
 			</text>
 		</panel>
-		<text name="streaming cost">
-			リソース料金：         [COST]
-		</text>
-		<text name="physics cost">
-			物理効果料金：        [COST]
-		</text>
 	</panel>
 	<panel name="upload_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				アップロード完了！
+		<panel name="upload_header_panel">
+			<text name="upload_header_text">
+				アップロード完了
 			</text>
 		</panel>
-		<text name="description">
-			おめでとうございます！モデルがアップロードされました。アップロードされたモデルは、持ち物の「オブジェクト」フォルダにあります。
+		<text name="model_uploaded_text">
+			モデルがアップロードされました。
+		</text>
+		<text name="inventory_text">
+			それは持ち物の「オブジェクト」フォルダにあります。
+		</text>
+		<text name="charged_fee">
+			あなたのアカウントに L$ [FEE] が請求されました。
 		</text>
 	</panel>
 	<button label="&lt;&lt; 戻る" name="back"/>
 	<button label="次へ&gt;&gt;" name="next"/>
+	<button label="ウェイトと料金の計算 &gt;&gt;" name="calculate"/>
+	<button label="計算中..." name="calculating"/>
 	<button label="アップロード" name="upload" tool_tip="シミュレーターにアップロード"/>
 	<button label="取り消し" name="cancel"/>
 	<button label="閉じる" name="close"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_search.xml b/indra/newview/skins/default/xui/ja/floater_search.xml
index 289098a343..0723be0068 100644
--- a/indra/newview/skins/default/xui/ja/floater_search.xml
+++ b/indra/newview/skins/default/xui/ja/floater_search.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="検索">
+<floater name="floater_search" title="">
 	<floater.string name="loading_text">
 		ローディング...
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index 0cb5c2d8bb..a8b5febd54 100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -24,20 +24,11 @@
 	<floater.string name="status_selectland">
 		土地をクリックし、ドラッグして選択
 	</floater.string>
-	<floater.string name="grid_screen_text">
-		画面
+	<floater.string name="status_selectcount">
+		[OBJ_COUNT] 個のオブジェクト（[PRIM_COUNT] 個のプリム [PE_STRING]）が選択されています
 	</floater.string>
-	<floater.string name="grid_local_text">
-		ローカル
-	</floater.string>
-	<floater.string name="grid_world_text">
-		インワールド
-	</floater.string>
-	<floater.string name="grid_reference_text">
-		レファレンス
-	</floater.string>
-	<floater.string name="grid_attachment_text">
-		アタッチメント
+	<floater.string name="status_selectprimequiv">
+		, [SEL_WEIGHT] プリム換算値
 	</floater.string>
 	<button label="" label_selected="" name="button focus" tool_tip="フォーカス"/>
 	<button label="" label_selected="" name="button move" tool_tip="動かす"/>
@@ -66,21 +57,13 @@
 	<check_box label="リンク部分を編集" name="checkbox edit linked parts"/>
 	<button label="リンク" name="link_btn"/>
 	<button label="リンクを外す" name="unlink_btn"/>
-	<text name="RenderingCost" tool_tip="このオブジェクトにかかるレンダリングコストを表示">
-		þ: [COUNT]
-	</text>
 	<check_box label="" name="checkbox uniform"/>
 	<text label="両側を延ばす" name="checkbox uniform label">
 		両側を延ばす
 	</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="オブジェクトの配置に使うグリッドルーラを選択します">
-		<combo_box.item label="インワールドグリッド" name="World"/>
-		<combo_box.item label="ローカルグリッド" name="Local"/>
-		<combo_box.item label="リファレンスグリッド" name="Reference"/>
-	</combo_box>
-	<button label="オプション" label_selected="オプション" name="Options..." tool_tip="グリッドオプションを表示します"/>
+	<check_box initial_value="true" label="スナップ" name="checkbox snap to grid"/>
+	<button label="オプション..." label_selected="オプション" name="Options..." tool_tip="グリッドオプションを表示します"/>
 	<button label="" label_selected="" name="ToolCube" tool_tip="キューブ"/>
 	<button label="" label_selected="" name="ToolPrism" tool_tip="プリズム"/>
 	<button label="" label_selected="" name="ToolPyramid" tool_tip="ピラミッド"/>
@@ -119,23 +102,11 @@
 		強度
 	</text>
 	<button label="適用" label_selected="適用" name="button apply to selection" tool_tip="選択した土地を修正します"/>
-	<text name="obj_count">
-		オブジェクト： [COUNT]
-	</text>
-	<text name="prim_count">
-		プリム： [COUNT]
-	</text>
-	<text name="linked_set_count">
-		リンクセット：[COUNT]
-	</text>
-	<text name="linked_set_cost" tool_tip="[prims] / [physics complexity] として現在選択されているリンクセットのコスト">
-		料金： [COST] / [PHYSICS]
-	</text>
-	<text name="object_count">
-		オブジェクト： [COUNT]
+	<text name="selection_empty">
+		何も選択されていません。
 	</text>
-	<text name="object_cost" tool_tip="[prims] / [physics complexity] として現在選択されているオブジェクトのコスト">
-		料金： [COST] / [PHYSICS]
+	<text name="selection_weight">
+		物理演算ウェイト [PHYS_WEIGHT]、レンダリングコスト [DISP_WEIGHT]。
 	</text>
 	<tab_container name="Object Info Tabs">
 		<panel label="一般" name="General">
@@ -359,7 +330,6 @@
 				<combo_box.item label="トーラス" name="Torus"/>
 				<combo_box.item label="平面" name="Plane"/>
 				<combo_box.item label="シリンダー" name="Cylinder"/>
-				<combo_box.item label="メッシュ" name="Mesh"/>
 			</combo_box>
 		</panel>
 		<panel label="特徴" name="Features">
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
index 4557815129..801b7a9db0 100644
--- a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
@@ -12,6 +12,114 @@
 	<string name="new_voice_effect">
 		（新登場！）
 	</string>
+	<string name="effect_Arena">
+		アリーナ
+	</string>
+	<string name="effect_Beast">
+		野獣
+	</string>
+	<string name="effect_Buff">
+		がっしり
+	</string>
+	<string name="effect_Buzz">
+		ブザー
+	</string>
+	<string name="effect_Camille">
+		カミール
+	</string>
+	<string name="effect_Creepy">
+		気味の悪い
+	</string>
+	<string name="effect_CreepyBot">
+		気味わるボット
+	</string>
+	<string name="effect_Cyber">
+		サイバー
+	</string>
+	<string name="effect_DeepBot">
+		ディープボット
+	</string>
+	<string name="effect_Demon">
+		デーモン
+	</string>
+	<string name="effect_Flirty">
+		気のありそうな
+	</string>
+	<string name="effect_Foxy">
+		魅惑的
+	</string>
+	<string name="effect_Halloween_2010_Bonus">
+		ハロウィン_2010_ボーナス
+	</string>
+	<string name="effect_Helium">
+		ヘリウム
+	</string>
+	<string name="effect_Husky">
+		ハスキー
+	</string>
+	<string name="effect_Intercom">
+		インターホン
+	</string>
+	<string name="effect_Macho">
+		マッチョ
+	</string>
+	<string name="effect_Micro">
+		ミクロ
+	</string>
+	<string name="effect_Mini">
+		ミニ
+	</string>
+	<string name="effect_Nano">
+		ナノ
+	</string>
+	<string name="effect_Nightmare">
+		悪夢
+	</string>
+	<string name="effect_PopBot">
+		ポップボット
+	</string>
+	<string name="effect_Rachel">
+		レイチェル
+	</string>
+	<string name="effect_Radio">
+		ラジオ
+	</string>
+	<string name="effect_Robot">
+		ロボット
+	</string>
+	<string name="effect_Roxanne">
+		ロクサン
+	</string>
+	<string name="effect_Sabrina">
+		サブリナ
+	</string>
+	<string name="effect_Samantha">
+		サマンサ
+	</string>
+	<string name="effect_Sexy">
+		セクシー
+	</string>
+	<string name="effect_Shorty">
+		チビ
+	</string>
+	<string name="effect_Sneaky">
+		コソコソ
+	</string>
+	<string name="effect_Stallion">
+		雄馬
+	</string>
+	<string name="effect_Sultry">
+		艶かしい
+	</string>
+	<string name="effect_Thunder">
+		サンダー
+	</string>
+	<string name="effect_Vixen">
+		性悪な
+	</string>
+	<string name="effect_WhinyBot">
+		不機嫌ボット
+	</string>
 	<text name="preview_text">
 		プレビュー
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index a471e4941d..5f5dad0d3e 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -2105,13 +2105,14 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 		<usetemplate ignoretext="「容姿」を編集中に、作成する衣類を装着するとき" name="okcancelignore" notext="いいえ" yestext="はい"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		年齢確認を済ませていないとこの区画を訪れることができません。  [SECOND_LIFE] サイトで年齢の確認を行いますか？
+		Second Life で Adult 指定のコンテンツや領域にアクセスできるのは 18 歳以上のユーザーのみです。年齢確認ページで 18 歳以上であることを証明してください。 
+これをクリックするとウェブブラウザが開きます。
 
 [_URL]
 		<url name="url" option="0">
-			https://secondlife.com/account/verification.php?lang=ja
+			https://secondlife.com/my/account/verification.php
 		</url>
-		<usetemplate ignoretext="年齢の確認を済ませていないとき" name="okcancelignore" notext="いいえ" yestext="はい"/>
+		<usetemplate ignoretext="年齢の確認を済ませていないとき" name="okcancelignore" notext="取り消し" yestext="年齢確認ページを開く"/>
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		支払情報が登録されていないとこのエリアを訪れることができません。  [SECOND_LIFE] サイトで登録を行いますか？
@@ -2800,6 +2801,12 @@ M キーを押して変更します。
 
 詳細についてはログをご覧ください。
 	</notification>
+	<notification name="MeshUploadPermError">
+		メッシュのアップロード許可をリクエスト中にエラーが発生しました。
+	</notification>
+	<notification name="RegionCapabilityRequestError">
+		リージョンの &apos;[CAPABILITY]&apos; という機能を取得できませんでした。
+	</notification>
 	<notification name="ShareItemsConfirmation">
 		次のアイテムを共有しますか？
 
diff --git a/indra/newview/skins/default/xui/ja/panel_sound_devices.xml b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
index da103a2d60..0824504235 100644
--- a/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
@@ -3,9 +3,18 @@
 	<panel.string name="default_text">
 		デフォルト
 	</panel.string>
+	<string name="name_no_device">
+		機器が設定されていません
+	</string>
+	<string name="name_default_system_device">
+		デフォルトのシステム機器
+	</string>
 	<text name="Input">
 		入力
 	</text>
+	<text name="Output">
+		出力
+	</text>
 	<text name="My volume label">
 		私の音量：
 	</text>
@@ -13,7 +22,4 @@
 	<text name="wait_text">
 		しばらくお待ちください。
 	</text>
-	<text name="Output">
-		出力
-	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index cb4fb80a55..f0c0d99a8e 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -34,6 +34,9 @@
 	<string name="StartupInitializingVFS">
 		VFS を初期化中です...
 	</string>
+	<string name="StartupRequireDriverUpdate">
+		グラフィックを初期化できませんでした。グラフィックドライバを更新してください。
+	</string>
 	<string name="ProgressRestoring">
 		復元中です...
 	</string>
@@ -91,6 +94,12 @@
 	<string name="LoginQuicktimeOK">
 		QuickTime が正常に初期化されました。
 	</string>
+	<string name="LoginRequestSeedCapGrant">
+		リージョンの機能をリクエストしています...
+	</string>
+	<string name="LoginRetrySeedCapGrant">
+		リージョンの機能をリクエスト、試行 [NUMBER] 回....
+	</string>
 	<string name="LoginWaitingForRegionHandshake">
 		リージョンのハンドシェイクを待っています...
 	</string>
@@ -1640,6 +1649,9 @@ support@secondlife.com にお問い合わせください。
 	</string>
 	<string name="SummaryForTheWeek" value="今週のまとめ。開始日は"/>
 	<string name="NextStipendDay" value="です。次回のお小遣い支給日："/>
+	<string name="GroupPlanningDate">
+		[year,datetime,utc]/[mthnum,datetime,utc]/[day,datetime,utc]
+	</string>
 	<string name="GroupIndividualShare" value="                      グループ       個人の割り当て"/>
 	<string name="GroupColumn" value="グループの設定"/>
 	<string name="Balance">
@@ -1969,6 +1981,9 @@ support@secondlife.com にお問い合わせください。
 	<string name="GroupMoneyDebits">
 		支出
 	</string>
+	<string name="GroupMoneyDate">
+		[year,datetime,utc]年[mth,datetime,utc]月[day,datetime,utc]日[weekday,datetime,utc]
+	</string>
 	<string name="ViewerObjectContents">
 		内容
 	</string>
@@ -4170,6 +4185,87 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Female - Wow">
 		女性 - Wow
 	</string>
+	<string name="/bow">
+		/おじぎする
+	</string>
+	<string name="/clap">
+		/拍手
+	</string>
+	<string name="/count">
+		/数える
+	</string>
+	<string name="/extinguish">
+		/消す
+	</string>
+	<string name="/kmb">
+		/くそくらえ
+	</string>
+	<string name="/muscle">
+		/筋肉もりもり
+	</string>
+	<string name="/no">
+		/いいえ
+	</string>
+	<string name="/no!">
+		/だめ！
+	</string>
+	<string name="/paper">
+		/パー
+	</string>
+	<string name="/pointme">
+		/自分を指差す
+	</string>
+	<string name="/pointyou">
+		/相手を指差す
+	</string>
+	<string name="/rock">
+		/グー
+	</string>
+	<string name="/scissor">
+		/チョキ
+	</string>
+	<string name="/smoke">
+		/タバコを吸う
+	</string>
+	<string name="/stretch">
+		/伸びをする
+	</string>
+	<string name="/whistle">
+		/口笛を吹く
+	</string>
+	<string name="/yes">
+		/はい
+	</string>
+	<string name="/yes!">
+		/イエス！
+	</string>
+	<string name="afk">
+		一時退席中
+	</string>
+	<string name="dance1">
+		ダンス1
+	</string>
+	<string name="dance2">
+		ダンス2
+	</string>
+	<string name="dance3">
+		ダンス3
+	</string>
+	<string name="dance4">
+		ダンス4
+	</string>
+	<string name="dance5">
+		ダンス5
+	</string>
+	<string name="dance6">
+		ダンス6
+	</string>
+	<string name="dance7">
+		ダンス7
+	</string>
+	<string name="dance8">
+		ダンス8
+	</string>
 	<string name="AvatarBirthDateFormat">
 		[year,datetime,slt]/[mthnum,datetime,slt]/[day,datetime,slt]
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_build_options.xml b/indra/newview/skins/default/xui/pt/floater_build_options.xml
index 666e185819..acc462ea94 100644
--- a/indra/newview/skins/default/xui/pt/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/pt/floater_build_options.xml
@@ -1,7 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="OPÇÕES DE GRADE">
-	<spinner label="Unidade da grade (metros)" name="GridResolution"/>
-	<spinner label="Ext. da Grade (metros)" name="GridDrawSize"/>
+	<floater.string name="grid_screen_text">
+		Tela
+	</floater.string>
+	<floater.string name="grid_local_text">
+		Local
+	</floater.string>
+	<floater.string name="grid_world_text">
+		Mundo
+	</floater.string>
+	<floater.string name="grid_reference_text">
+		Referência
+	</floater.string>
+	<floater.string name="grid_attachment_text">
+		Anexo
+	</floater.string>
+	<text name="grid_mode_label" tool_tip="Opacidade da grade">
+		Modo
+	</text>
+	<combo_box name="combobox grid mode" tool_tip="Selecione o tipo de régua da grade onde o objeto será colocado">
+		<combo_box.item label="Grid SL" name="World"/>
+		<combo_box.item label="Grid local" name="Local"/>
+		<combo_box.item label="Grid de referência" name="Reference"/>
+	</combo_box>
+	<spinner label="Unidades (metros):" name="GridResolution"/>
+	<spinner label="Extensões (metros)" name="GridDrawSize"/>
 	<check_box label="Encaixar em sub-unidades" name="GridSubUnit"/>
 	<check_box label="Ver corte transversal" name="GridCrossSection"/>
 	<text name="grid_opacity_label" tool_tip="Opacidade da grade">
diff --git a/indra/newview/skins/default/xui/pt/floater_model_preview.xml b/indra/newview/skins/default/xui/pt/floater_model_preview.xml
index fbd88500a8..4a537fafb1 100644
--- a/indra/newview/skins/default/xui/pt/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_model_preview.xml
@@ -60,6 +60,9 @@
 	<string name="simplifying">
 		Simplificando...
 	</string>
+	<string name="tbd">
+		A ser definido
+	</string>
 	<text name="name_label">
 		Nome:
 	</text>
@@ -80,23 +83,26 @@
 			Nível de detalhamento: Mais baixo
 		</combo_item>
 	</combo_box>
-	<panel>
-		<text name="streaming cost">
-			Custo do recurso: [COST]
-		</text>
-		<text name="physics cost">
-			Custo físico: [COST]
-		</text>
-		<text name="upload fee">
-			Taxa de upload: N/D
-		</text>
-	</panel>
-	<text name="status">
-		[STATUS]
+	<text name="warning_title">
+		AVISO:
+	</text>
+	<text name="warning_message">
+		Não será possível concluir o upload final desse modelo para os servidores do Second Life. [[VURL] Saiba como] ativar o upload de modelos mesh.
+	</text>
+	<text name="weights_text">
+		Download:
+Físico:
+Servidor:
+
+Equivalente em prims:
+	</text>
+	<text name="weights">
+		[ST]
+[PH]
+[SIM]
+
+[EQ]
 	</text>
-	<button label="Padrão" name="reset_btn" tool_tip="Valores padrão"/>
-	<button label="Upload" name="ok_btn" tool_tip="Carregar no simulador"/>
-	<button label="Cancelar" name="cancel_btn"/>
 	<tab_container name="import_tab">
 		<panel label="Nível de detalhamento:" name="lod_panel">
 			<text name="lod_table_header">
@@ -234,4 +240,11 @@
 			<spinner name="pelvis_offset" value="0.0"/>
 		</panel>
 	</tab_container>
+	<text name="upload_fee">
+		Tarifa de upload: L$ [FEE]
+	</text>
+	<button label="Definir como padrão" name="reset_btn" tool_tip="Definir como padrão"/>
+	<button label="Calcular pesos e tarifa" name="calculate_btn" tool_tip="Calcular pesos e tarifa"/>
+	<button label="Upload" name="ok_btn" tool_tip="Carregar no simulador"/>
+	<button label="Cancelar" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_model_wizard.xml b/indra/newview/skins/default/xui/pt/floater_model_wizard.xml
index e8d5fcdc05..a67a66a446 100644
--- a/indra/newview/skins/default/xui/pt/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/pt/floater_model_wizard.xml
@@ -2,190 +2,216 @@
 <floater name="Model Wizard" title="CARREGAR ASSISTENTE DE MODELAGEM">
 	<button label="5. Carregar" name="upload_btn"/>
 	<button label="4. Revisar" name="review_btn"/>
-	<button label="3. Física" name="physics2_btn"/>
 	<button label="3. Física" name="physics_btn"/>
 	<button label="2. Otimizar" name="optimize_btn"/>
 	<button label="1. Selecionra arquivo" name="choose_file_btn"/>
 	<panel name="choose_file_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Carregar modelo
+		<panel name="choose_file_header_panel">
+			<text name="choose_file_header_text">
+				Escolher arquivo de modelo
 			</text>
 		</panel>
-		<text name="description">
-			O assistente ajuda você a importar modelos mesh para o Second Life.  Para começar, especifique o arquivo com o modelo a ser importado.  O Second Life suporta arquivos COLLADA (.dae).
-		</text>
-		<panel name="content">
-			<text name="Cache location">
-				Nome do arquivo:
+		<panel name="choose_file_content_panel">
+			<text name="advanced_users_text">
+				Usuários avançados: se você estiver familiarizado com ferramentas de criação de conteúdo 3D, use o Advanced Uploader.
+			</text>
+			<button label="Trocar para avançado" name="switch_to_advanced"/>
+			<text name="choose_model_file_label">
+				Escolha o arquivo de modelo para upload
 			</text>
 			<button label="Procurar..." label_selected="Procurar..." name="browse"/>
+			<text name="support_collada_text">
+				O Second Life oferece suporte a arquivos COLLADA (.dae)
+			</text>
+			<text name="dimensions_label">
+				Dimensões (metros):
+			</text>
 			<text name="dimensions">
-				X         Y:         Z:
+				X         Y         Z
+			</text>
+			<text name="warning_label">
+				AVISO:
 			</text>
-			<text name="dimension_dividers">
-				|               |
+			<text name="warning_text">
+				Não será possível concluir a etapa final do upload desse modelo para os servidores do Second Life. [secondlife:///app/floater/learn_more Saiba como] configurar sua conta para uploads de modelos mesh.
 			</text>
 		</panel>
 	</panel>
 	<panel name="optimize_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Otimizar
+		<panel name="optimize_header_panel">
+			<text name="optimize_header_text">
+				Otimizar modelo
 			</text>
 		</panel>
-		<text name="description">
-			O assistente otimizou seu modelo para melhorar o desempenho.  Ajuste os resultados da otimização abaixou ou clique em Próximo para prosseguir.
+		<text name="optimize_hint">
+			O modelo foi ajustado para desempenho. Faça novos ajustes, se desejar.
 		</text>
-		<panel name="content">
+		<panel name="optimize_content_panel">
+			<text name="generating_lod_label">
+				Gerar nível de detalhes
+			</text>
 			<text name="high_detail_text">
-				Gerar nível de detalhamento: Alto
+				Gerar nível de detalhes: Alto
 			</text>
 			<text name="medium_detail_text">
-				Gerar nível de detalhamento: Médio
+				Gerar nível de detalhes: Médio
 			</text>
 			<text name="low_detail_text">
-				Gerar nível de detalhamento: Baixo
+				Gerar nível de detalhes: Baixo
 			</text>
 			<text name="lowest_detail_text">
-				Gerar nível de detalhamento: Mais baixo
+				Gerar nível de detalhes: mais baixo
 			</text>
 		</panel>
 		<panel name="content2">
-			<text name="lod_label">
-				Visualizar modelo:
+			<text name="optimize_performance_text">
+				Desempenho
+			</text>
+			<text name="optimize_faster_rendering_text">
+				Renderização mais rápida
+Menos detalhes
+Peso menor do prim
+			</text>
+			<text name="optimize_accuracy_text">
+				Precisão
+			</text>
+			<text name="optimize_slower_rendering_text">
+				Renderização mais lenta
+Mais detalhes
+Peso maior do prim
+			</text>
+			<text name="accuracy_slider_mark1">
+				&apos;
+			</text>
+			<text name="accuracy_slider_mark2">
+				&apos;
 			</text>
-			<combo_box name="preview_lod_combo2" tool_tip="LOD para ver no renderizador de pré-visualização">
-				<combo_item name="high">
-					Alto
+			<text name="accuracy_slider_mark3">
+				&apos;
+			</text>
+			<button label="Recalcular geometria" name="recalculate_geometry_btn"/>
+			<text name="geometry_preview_label">
+				Visualização da geometria
+			</text>
+			<combo_box name="preview_lod_combo" tool_tip="LOD para exibir na renderização de visualização">
+				<combo_item name="preview_lod_high">
+					Máximo de detalhes
 				</combo_item>
-				<combo_item name="medium">
-					Médio
+				<combo_item name="preview_lod_medium">
+					Detalhes médios
 				</combo_item>
-				<combo_item name="low">
-					Baixo
+				<combo_item name="preview_lod_low">
+					Poucos detalhes
 				</combo_item>
-				<combo_item name="lowest">
-					Mais baixo
+				<combo_item name="preview_lod_lowest">
+					Mínimo de detalhes
 				</combo_item>
 			</combo_box>
-			<text name="streaming cost">
-				Custo do recurso:    [COST]
-			</text>
-			<text name="dimensions">
-				X         Y:         Z:
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
 		</panel>
 	</panel>
 	<panel name="physics_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Física
+		<panel name="physics_header_panel">
+			<text name="physics_header_text">
+				Ajustar físico
 			</text>
 		</panel>
-		<text name="description">
-			O assistente cria uma forma física que determina como o objeto interage com outros objetos e avatares.  Ajuste a barra para o nível de detalhamento mais apropriado para a finalidade do seu objeto:
+		<text name="physics_hint">
+			Criaremos uma forma para o corpo externo do modelo. Ajuste o nível de detalhes como necessário para a finalidade desejada de seu modelo.
 		</text>
-		<panel name="content">
-			<text name="streaming cost">
-				Custo do recurso:       [COST]
+		<panel name="physics_content_panel">
+			<text name="physics_performance_text">
+				Desempenho
 			</text>
-		</panel>
-	</panel>
-	<panel name="physics2_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Física
+			<text name="physics_faster_rendering_text">
+				Renderização mais rápida
+Menos detalhes
+Peso menor do prim
 			</text>
-		</panel>
-		<text name="description">
-			Veja a forma física abaixo e clique em Próximo para prosseguir.   Para modificar o formato físico, clique em Anterior.
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				Visualizar modelo:
+			<text name="physics_accuracy_text">
+				Precisão
 			</text>
-			<combo_box name="preview_lod_combo3" tool_tip="LOD para ver no renderizador de pré-visualização">
-				<combo_item name="high">
-					Alto
+			<text name="physics_slower_dendering_text">
+				Renderização mais lenta
+Mais detalhes
+Peso maior do prim
+			</text>
+			<text name="physics_example_1">
+				Exemplos:
+Objetos em movimento
+Objetos voadores
+Veículos
+			</text>
+			<text name="physics_example_2">
+				Exemplos:
+Objetos estáticos pequenos
+Objetos menos detalhados
+Mobília simples
+			</text>
+			<text name="physics_example_3">
+				Exemplos:
+Objetos estáticos
+Objetos detalhados
+Construções
+			</text>
+			<button label="Recalcular físico" name="recalculate_physics_btn"/>
+			<button label="Recalculando..." name="recalculating_physics_btn"/>
+			<text name="physics_preview_label">
+				Visualização do físico
+			</text>
+			<combo_box name="preview_lod_combo2" tool_tip="LOD para exibir na renderização de visualização">
+				<combo_item name="preview_lod2_high">
+					Máximo de detalhes
 				</combo_item>
-				<combo_item name="medium">
-					Médio
+				<combo_item name="preview_lod2_medium">
+					Detalhes médios
 				</combo_item>
-				<combo_item name="low">
-					Baixo
+				<combo_item name="preview_lod2_low">
+					Poucos detalhes
 				</combo_item>
-				<combo_item name="lowest">
-					Mais baixo
+				<combo_item name="preview_lod2_lowest">
+					Mínimo de detalhes
 				</combo_item>
 			</combo_box>
-			<text name="dimensions">
-				X         Y:         Z:
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
-			<text name="streaming cost">
-				Custo do recurso:       [COST]
-			</text>
 		</panel>
 	</panel>
 	<panel name="review_panel">
-		<panel name="header_panel">
-			<text name="header_text">
+		<panel name="review_header_panel">
+			<text name="review_header_text">
 				Revisar
 			</text>
 		</panel>
-		<text name="description">
-			Veja os detalhes abaixo e clique em  Carregar para carregar seu modelo. Seu saldo L$ será cobrado quando você clicar em Carregar.
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				Visualizar modelo:
+		<panel name="review_content_panel">
+			<text name="review_prim_equiv">
+				Impacto no lote/região: [EQUIV] equivalentes de prim
 			</text>
-			<combo_box name="preview_lod_combo" tool_tip="LOD para ver no renderizador de pré-visualização">
-				<combo_item name="high">
-					Alto
-				</combo_item>
-				<combo_item name="medium">
-					Médio
-				</combo_item>
-				<combo_item name="low">
-					Baixo
-				</combo_item>
-				<combo_item name="lowest">
-					Mais baixo
-				</combo_item>
-			</combo_box>
-			<text name="dimensions">
-				X         Y:         Z:
+			<text name="review_fee">
+				Uma tarifa de upload de L$ [FEE] será debitada da sua conta.
 			</text>
-			<text name="dimension_dividers">
-				|               |
+			<text name="review_confirmation">
+				Ao clicar no botão de upload, você confirma que detém os direitos apropriados sobre o material contido no modelo.
 			</text>
 		</panel>
-		<text name="streaming cost">
-			Custo do recurso:         [COST]
-		</text>
-		<text name="physics cost">
-			Custo físico:        [COST]
-		</text>
 	</panel>
 	<panel name="upload_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Carregado!
+		<panel name="upload_header_panel">
+			<text name="upload_header_text">
+				Upload concluído
 			</text>
 		</panel>
-		<text name="description">
-			Parabéns! Seu modelo foi carregado com êxito.   Procure-o na pasta Objetos de seu inventário.
+		<text name="model_uploaded_text">
+			Seu modelo foi carregado.
+		</text>
+		<text name="inventory_text">
+			Disponível na pasta Objetos do seu inventário.
+		</text>
+		<text name="charged_fee">
+			L$ [FEE] foram debitados da sua conta.
 		</text>
 	</panel>
 	<button label="&lt;&lt; Voltar" name="back"/>
 	<button label="Próximo &gt;&gt;" name="next"/>
+	<button label="Calcular pesos e tarifa &gt;&gt;" name="calculate"/>
+	<button label="Calculando..." name="calculating"/>
 	<button label="Carregar" name="upload" tool_tip="Carregar no simulador"/>
 	<button label="Cancelar" name="cancel"/>
 	<button label="Fechar" name="close"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_search.xml b/indra/newview/skins/default/xui/pt/floater_search.xml
index 4bf7181180..3509cb786d 100644
--- a/indra/newview/skins/default/xui/pt/floater_search.xml
+++ b/indra/newview/skins/default/xui/pt/floater_search.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="BUSCAR">
+<floater name="floater_search" title="">
 	<floater.string name="loading_text">
 		Carregando...
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml
index 35d9a0ffab..6850bf2d7c 100644
--- a/indra/newview/skins/default/xui/pt/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tools.xml
@@ -24,20 +24,11 @@
 	<floater.string name="status_selectland">
 		Clicar e arrastar para selecionar a terra
 	</floater.string>
-	<floater.string name="grid_screen_text">
-		Tela
+	<floater.string name="status_selectcount">
+		[OBJ_COUNT] objetos ( [PRIM_COUNT] prims[PE_STRING] ) selecionados
 	</floater.string>
-	<floater.string name="grid_local_text">
-		Local
-	</floater.string>
-	<floater.string name="grid_world_text">
-		Mundo
-	</floater.string>
-	<floater.string name="grid_reference_text">
-		Referência
-	</floater.string>
-	<floater.string name="grid_attachment_text">
-		Anexo
+	<floater.string name="status_selectprimequiv">
+		, [SEL_WEIGHT] equivalentes de prims
 	</floater.string>
 	<button label="" label_selected="" name="button focus" tool_tip="Foco"/>
 	<button label="" label_selected="" name="button move" tool_tip="Mover"/>
@@ -66,20 +57,12 @@
 	<check_box label="Editar partes linkadas" name="checkbox edit linked parts"/>
 	<button label="Link" name="link_btn"/>
 	<button label="Desconectar links" name="unlink_btn"/>
-	<text name="RenderingCost" tool_tip="Mostra o cálculo do custo de renderização do objeto">
-		þ: [COUNT]
-	</text>
 	<check_box label="" name="checkbox uniform"/>
 	<text label="Esticar ambos lados" name="checkbox uniform label">
 		Esticar ambos lados
 	</text>
 	<check_box initial_value="true" label="Esticar texturas" name="checkbox stretch textures"/>
-	<check_box initial_value="true" label="Mostrar na grade" name="checkbox snap to grid"/>
-	<combo_box name="combobox grid mode" tool_tip="Selecione a régua da grade onde o objeto será colocado">
-		<combo_box.item label="Grade SL" name="World"/>
-		<combo_box.item label="Local" name="Local"/>
-		<combo_box.item label="Referência" name="Reference"/>
-	</combo_box>
+	<check_box initial_value="true" label="Ajustar" name="checkbox snap to grid"/>
 	<button label="Opções..." label_selected="Opções..." name="Options..." tool_tip="Mais opções de grade"/>
 	<button label="" label_selected="" name="ToolCube" tool_tip="Cubo"/>
 	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/>
@@ -119,23 +102,11 @@
 		Força
 	</text>
 	<button label="Aplicar" label_selected="Aplicar" name="button apply to selection" tool_tip="Modificar a terra selecionada"/>
-	<text left="134" name="obj_count">
-		Objetos: [COUNT]
-	</text>
-	<text left="134" name="prim_count">
-		Prims: [COUNT]
-	</text>
-	<text name="linked_set_count">
-		Conjuntos linkados: [COUNT]
-	</text>
-	<text name="linked_set_cost" tool_tip="Custo dos conjuntos selecionados [prims],[complexidade física]">
-		Custo: [COST] / [PHYSICS]
-	</text>
-	<text name="object_count">
-		Objetos: [COUNT]
+	<text name="selection_empty">
+		Nada selecionado.
 	</text>
-	<text name="object_cost" tool_tip="Custo dos objetos selecionados [prims] / [complexidade física]">
-		Custo: [COST] / [PHYSICS]
+	<text name="selection_weight">
+		Peso do físico [PHYS_WEIGHT], custo de renderização [DISP_WEIGHT].
 	</text>
 	<tab_container name="Object Info Tabs" tab_max_width="60" tab_min_width="30" width="288">
 		<panel label="Comum" name="General">
@@ -353,7 +324,6 @@
 				<combo_box.item label="Toróide" name="Torus"/>
 				<combo_box.item label="Plano" name="Plane"/>
 				<combo_box.item label="Cilindro" name="Cylinder"/>
-				<combo_box.item label="Mesh" name="Mesh"/>
 			</combo_box>
 		</panel>
 		<panel label="Recursos" name="Features">
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
index cb9b3c8c0d..4f01600d9f 100644
--- a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
@@ -12,6 +12,114 @@
 	<string name="new_voice_effect">
 		(Novo!)
 	</string>
+	<string name="effect_Arena">
+		Arena
+	</string>
+	<string name="effect_Beast">
+		Fera
+	</string>
+	<string name="effect_Buff">
+		Entusiasmado
+	</string>
+	<string name="effect_Buzz">
+		Zumbido
+	</string>
+	<string name="effect_Camille">
+		Camille
+	</string>
+	<string name="effect_Creepy">
+		Assustador
+	</string>
+	<string name="effect_CreepyBot">
+		RobôAssustador
+	</string>
+	<string name="effect_Cyber">
+		Cyber
+	</string>
+	<string name="effect_DeepBot">
+		RobôVozGrossa
+	</string>
+	<string name="effect_Demon">
+		Demônio
+	</string>
+	<string name="effect_Flirty">
+		Paquerador
+	</string>
+	<string name="effect_Foxy">
+		Sensual
+	</string>
+	<string name="effect_Halloween_2010_Bonus">
+		Bônus_Halloween_2010
+	</string>
+	<string name="effect_Helium">
+		Hélio
+	</string>
+	<string name="effect_Husky">
+		Rouco
+	</string>
+	<string name="effect_Intercom">
+		Interfone
+	</string>
+	<string name="effect_Macho">
+		Macho
+	</string>
+	<string name="effect_Micro">
+		Micro
+	</string>
+	<string name="effect_Mini">
+		Mini
+	</string>
+	<string name="effect_Nano">
+		Nano
+	</string>
+	<string name="effect_Nightmare">
+		Pesadelo
+	</string>
+	<string name="effect_PopBot">
+		RobôPop
+	</string>
+	<string name="effect_Rachel">
+		Rachel
+	</string>
+	<string name="effect_Radio">
+		Rádio
+	</string>
+	<string name="effect_Robot">
+		Robô
+	</string>
+	<string name="effect_Roxanne">
+		Roxanne
+	</string>
+	<string name="effect_Sabrina">
+		Sabrina
+	</string>
+	<string name="effect_Samantha">
+		Samantha
+	</string>
+	<string name="effect_Sexy">
+		Sexy
+	</string>
+	<string name="effect_Shorty">
+		Baixinho
+	</string>
+	<string name="effect_Sneaky">
+		Sorrateiro
+	</string>
+	<string name="effect_Stallion">
+		Garanhão
+	</string>
+	<string name="effect_Sultry">
+		Ardente
+	</string>
+	<string name="effect_Thunder">
+		Trovão
+	</string>
+	<string name="effect_Vixen">
+		Maliciosa
+	</string>
+	<string name="effect_WhinyBot">
+		RobôReclamão
+	</string>
 	<text name="preview_text">
 		Visualizar
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index ffdaf8a26f..0bb02a7199 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -2047,13 +2047,14 @@ Inclua um link para facilitar o acesso para visitantes. Teste o link na barra de
 		<usetemplate ignoretext="Vestir as roupas que eu criar enquanto edito minha aparência" name="okcancelignore" notext="Não" yestext="Sim"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Área restrita a residentes com idade comprovada.   Deseja ir ao site do [SECOND_LIFE] para comprovar sua idade? 
+		Você deve ter no mínimo 18 anos para acessar conteúdo e áreas adultas no Second Life. Visite nossa página de verificação de idade para confirmar que você tem mais de 18 anos. 
+Isso abrirá o seu navegador.
 
 [_URL]
 		<url name="url" option="0">
-			https://secondlife.com/account/verification.php?lang=pt
+			https://secondlife.com/my/account/verification.php
 		</url>
-		<usetemplate ignoretext="Ainda não comprovei minha idade" name="okcancelignore" notext="Não" yestext="Sim"/>
+		<usetemplate ignoretext="Ainda não comprovei minha idade" name="okcancelignore" notext="Cancelar" yestext="Ir para verificação de idade"/>
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Área restrita a residentes que já cadastraram seus dados de pagamento  Deseja ir ao site do [SECOND_LIFE] para cuidar disso? 
@@ -2737,6 +2738,12 @@ O botão será exibido quando houver espaço suficente.
 
 Mais detalhes no log.
 	</notification>
+	<notification name="MeshUploadPermError">
+		Erro ao solicitar permissões de upload de mesh.
+	</notification>
+	<notification name="RegionCapabilityRequestError">
+		Não foi possível obter o recurso &apos;[CAPABILITY]&apos; da região.
+	</notification>
 	<notification name="ShareItemsConfirmation">
 		Tem certeza de que quer compartilhar os itens abaixo?
 
diff --git a/indra/newview/skins/default/xui/pt/panel_sound_devices.xml b/indra/newview/skins/default/xui/pt/panel_sound_devices.xml
index fb612ca19b..66db89f48f 100644
--- a/indra/newview/skins/default/xui/pt/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/pt/panel_sound_devices.xml
@@ -3,9 +3,18 @@
 	<panel.string name="default_text">
 		Padrão
 	</panel.string>
+	<string name="name_no_device">
+		Nenhum
+	</string>
+	<string name="name_default_system_device">
+		Dispositivo padrão do sistema
+	</string>
 	<text name="Input">
 		Entrada
 	</text>
+	<text name="Output">
+		Saída
+	</text>
 	<text name="My volume label">
 		Meu volume:
 	</text>
@@ -13,7 +22,4 @@
 	<text name="wait_text">
 		Aguarde
 	</text>
-	<text name="Output">
-		Saída
-	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 73b954d79d..2f3b438564 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -25,6 +25,9 @@
 	<string name="StartupInitializingVFS">
 		Iniciando VFS...
 	</string>
+	<string name="StartupRequireDriverUpdate">
+		Falha na inicialização dos gráficos. Atualize seu driver gráfico!
+	</string>
 	<string name="ProgressRestoring">
 		Restaurando...
 	</string>
@@ -79,6 +82,12 @@
 	<string name="LoginQuicktimeOK">
 		O QuickTime foi inicializado com sucesso.
 	</string>
+	<string name="LoginRequestSeedCapGrant">
+		Solicitando recursos da região...
+	</string>
+	<string name="LoginRetrySeedCapGrant">
+		Solicitando recursos da região, tentativa [NUMBER]...
+	</string>
 	<string name="LoginWaitingForRegionHandshake">
 		Aguardando handshake com a região...
 	</string>
@@ -1574,6 +1583,9 @@ Titulares de contas gratuitas não poderão acessar o Second Life para acomodar
 	</string>
 	<string name="SummaryForTheWeek" value="Resumo para esta semana, com início em "/>
 	<string name="NextStipendDay" value=". Próximo dia de salário é "/>
+	<string name="GroupPlanningDate">
+		[mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc]
+	</string>
 	<string name="GroupIndividualShare" value="Grupo       Divisão individualI"/>
 	<string name="GroupColumn" value="Grupo"/>
 	<string name="Balance">
@@ -1897,6 +1909,9 @@ Titulares de contas gratuitas não poderão acessar o Second Life para acomodar
 	<string name="GroupMoneyDebits">
 		Débitos
 	</string>
+	<string name="GroupMoneyDate">
+		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
+	</string>
 	<string name="ViewerObjectContents">
 		Conteúdo
 	</string>
@@ -4031,6 +4046,87 @@ Denunciar abuso
 	<string name="Female - Wow">
 		Wow - feminino
 	</string>
+	<string name="/bow">
+		/reverência
+	</string>
+	<string name="/clap">
+		/palmas
+	</string>
+	<string name="/count">
+		/contar
+	</string>
+	<string name="/extinguish">
+		/apagar
+	</string>
+	<string name="/kmb">
+		/dane_se
+	</string>
+	<string name="/muscle">
+		/músculos
+	</string>
+	<string name="/no">
+		/não
+	</string>
+	<string name="/no!">
+		/não!
+	</string>
+	<string name="/paper">
+		/papel
+	</string>
+	<string name="/pointme">
+		/apontar_eu
+	</string>
+	<string name="/pointyou">
+		/apontar_você
+	</string>
+	<string name="/rock">
+		/pedra
+	</string>
+	<string name="/scissor">
+		/tesoura
+	</string>
+	<string name="/smoke">
+		/fumar
+	</string>
+	<string name="/stretch">
+		/alongar
+	</string>
+	<string name="/whistle">
+		/assobiar
+	</string>
+	<string name="/yes">
+		/sim
+	</string>
+	<string name="/yes!">
+		/sim!
+	</string>
+	<string name="afk">
+		ldt
+	</string>
+	<string name="dance1">
+		dança1
+	</string>
+	<string name="dance2">
+		dança2
+	</string>
+	<string name="dance3">
+		dança3
+	</string>
+	<string name="dance4">
+		dança4
+	</string>
+	<string name="dance5">
+		dança5
+	</string>
+	<string name="dance6">
+		dança6
+	</string>
+	<string name="dance7">
+		dança7
+	</string>
+	<string name="dance8">
+		dança8
+	</string>
 	<string name="AvatarBirthDateFormat">
 		[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
 	</string>
diff --git a/indra/newview/skins/minimal/xui/de/panel_people.xml b/indra/newview/skins/minimal/xui/de/panel_people.xml
index a52557236f..1b6565eb73 100644
--- a/indra/newview/skins/minimal/xui/de/panel_people.xml
+++ b/indra/newview/skins/minimal/xui/de/panel_people.xml
@@ -49,7 +49,7 @@
 				<button label="Profil" name="view_profile_btn" tool_tip="Bilder, Gruppen und andere Einwohner-Informationen anzeigen"/>
 			</layout_panel>
 			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="Instant Messenger öffnen"/>
+				<button label="IM" name="im_btn" tool_tip="IM-Sitzung öffnen"/>
 			</layout_panel>
 			<layout_panel name="call_btn_lp">
 				<button label="Anrufen" name="call_btn" tool_tip="Diesen Einwohner anrufen"/>
diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 6e8ad9adaf..ec2683880a 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -187,9 +187,9 @@
        name="status_bar_container"
        tab_stop="false"
        height="30"
-       left="-70"
+       left="-120"
        top="0"
-       width="70"
+       width="120"
        visible="false"/>
   <panel follows="top|bottom"
          height="500"
diff --git a/indra/newview/skins/minimal/xui/en/panel_login.xml b/indra/newview/skins/minimal/xui/en/panel_login.xml
index 3903658e71..d89a0c6be1 100644
--- a/indra/newview/skins/minimal/xui/en/panel_login.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_login.xml
@@ -118,33 +118,16 @@ label="Remember password"
   name="connect_btn"
   top="35"
   width="90" />
-  <text
-  follows="left|bottom"
-  font="SansSerifSmall"
-  height="15"
-  left_pad="10"
-  name="mode_selection_text"
-top="20"
-  width="130">
-       Mode:
- </text>
-<combo_box
-  follows="left|bottom"
-  height="23"
-  max_chars="128"
-  top_pad="0"
-  tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
-  name="mode_combo"
-  width="120">
-<combo_box.item
-  label="Basic"
-  name="Basic"
-  value="settings_minimal.xml" />
-<combo_box.item
-  label="Advanced"
-  name="Advanced"
-  value="" />
-</combo_box>
+  <menu_button
+left_pad="10"
+top="35"
+width="80"
+height="23"
+label="Mode ▲"
+name="mode_menu"
+tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
+menu_filename="menu_mode_change.xml"
+    />
 </layout_panel>
 <layout_panel
 tab_stop="false"
diff --git a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
index 6dc1a1c9b0..e50911b8d2 100644
--- a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
@@ -63,7 +63,7 @@ width="31" />
      mouse_opaque="false"
      name="location_combo"
      top_delta="0"
-     width="440">
+     width="390">
     </location_input>
     <icon follows="right"
           height="20"
diff --git a/indra/newview/skins/minimal/xui/en/panel_status_bar.xml b/indra/newview/skins/minimal/xui/en/panel_status_bar.xml
index 6ccd0e938d..c816d97eee 100644
--- a/indra/newview/skins/minimal/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_status_bar.xml
@@ -12,7 +12,7 @@
  name="status"
  top="19"
  tab_stop="false"
- width="70">
+ width="120">
     <panel.string
      name="packet_loss_tooltip">
         Packet Loss
@@ -33,6 +33,18 @@
      name="buycurrencylabel">
         L$ [AMT]
     </panel.string>
+  <menu_button
+     follows="right|top"    
+    image_color="0 0 0 0"
+    hover_glow_amount="0"
+    left="2"
+    top="7"
+    width="50"  
+    height="18"
+    label="Mode ▼"
+    tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
+    menu_filename="menu_mode_change.xml"
+    />
      <button
      follows="right|top"
      height="16"
@@ -41,7 +53,7 @@
      image_pressed="Pause_Press"
      image_pressed_selected="Play_Press"
      is_toggle="true"
-     left="15"
+     left="65"
      top="7"
      name="media_toggle_btn"
      tool_tip="Start/Stop All Media (Music, Video, Web pages)"
diff --git a/indra/newview/skins/minimal/xui/es/panel_people.xml b/indra/newview/skins/minimal/xui/es/panel_people.xml
index 8d3d14fa89..a06f3010d7 100644
--- a/indra/newview/skins/minimal/xui/es/panel_people.xml
+++ b/indra/newview/skins/minimal/xui/es/panel_people.xml
@@ -56,7 +56,7 @@
 				<button label="Llamar" name="call_btn" tool_tip="Llamar a este Residente"/>
 			</layout_panel>
 			<layout_panel name="teleport_btn_lp">
-				<button label="Teleporte" name="teleport_btn" tool_tip="Ofrecer teleporte"/>
+				<button label="Teleportarte" name="teleport_btn" tool_tip="Ofrecer teleporte"/>
 			</layout_panel>
 		</layout_stack>
 		<layout_stack name="bottom_bar_ls1">
diff --git a/indra/newview/skins/minimal/xui/fr/panel_people.xml b/indra/newview/skins/minimal/xui/fr/panel_people.xml
index 4d6e31d9b5..427a420b91 100644
--- a/indra/newview/skins/minimal/xui/fr/panel_people.xml
+++ b/indra/newview/skins/minimal/xui/fr/panel_people.xml
@@ -50,13 +50,13 @@ Vous recherchez des résidents avec qui passer du temps ? Essayez avec le bouto
 				<button label="Profil" name="view_profile_btn" tool_tip="Afficher la photo, les groupes et autres infos des résidents"/>
 			</layout_panel>
 			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="Ouvrir une session IM"/>
+				<button label="IM" name="im_btn" tool_tip="Ouvrir une session IM."/>
 			</layout_panel>
 			<layout_panel name="call_btn_lp">
 				<button label="Appeler" name="call_btn" tool_tip="Appeler ce résident."/>
 			</layout_panel>
 			<layout_panel name="teleport_btn_lp">
-				<button label="Téléporter" name="teleport_btn" tool_tip="Proposer une téléportation"/>
+				<button label="Téléporter" name="teleport_btn" tool_tip="Proposer une téléportation."/>
 			</layout_panel>
 		</layout_stack>
 		<layout_stack name="bottom_bar_ls1">
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index cd9d52cb85..0a21d8714c 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -750,7 +750,7 @@ class DarwinManifest(ViewerManifest):
                                     "libexpat.1.5.2.dylib",
                                     "libexception_handler.dylib",
                                     "libGLOD.dylib",
-				    "libcollada14dom.dylib"
+                                    "libcollada14dom.dylib"
                                     ):
                         target_lib = os.path.join('../../..', libfile)
                         self.run_command("ln -sf %(target)r %(link)r" % 
@@ -1027,15 +1027,15 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libbreakpad_client.so.0.0.0")
             self.path("libbreakpad_client.so.0")
             self.path("libbreakpad_client.so")
-	    self.path("libcollada14dom.so")
+            self.path("libcollada14dom.so")
             self.path("libdb-5.1.so")
             self.path("libdb-5.so")
             self.path("libdb.so")
             self.path("libcrypto.so.1.0.0")
             self.path("libexpat.so.1.5.2")
             self.path("libssl.so.1.0.0")
-	    self.path("libglod.so")
-	    self.path("libminizip.so")
+            self.path("libglod.so")
+            self.path("libminizip.so")
             self.path("libuuid.so")
             self.path("libuuid.so.16")
             self.path("libuuid.so.16.0.22")