Merge Firestorm LGPL

2016-07-26 18:42:13 +02:00 · 2016-07-26 18:42:13 +02:00 · b8f2d2801b
parent a1a1723b14 94383395d5
commit b8f2d2801b
62 changed files with 885 additions and 189 deletions
--- a/README_BUILD_FIRESTORM_LINUX.txt
+++ b/README_BUILD_FIRESTORM_LINUX.txt
@ -1,4 +1,4 @@
-First, make sure gcc-4.6 and g++-4.6 are installed.
+First, make sure gcc-4.7 and g++-4.7 are installed.

 32bit build platforms are better tested at this point and strongly recommended.

--- a/indra/llmessage/message.cpp
+++ b/indra/llmessage/message.cpp
@ -4017,7 +4017,10 @@ void LLMessageSystem::sendUntrustedSimulatorMessageCoro(std::string url, std::st
 {
    LLCore::HttpRequest::policy_t httpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID);
    LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t
-        httpAdapter(new LLCoreHttpUtil::HttpCoroutineAdapter("groupMembersRequest", httpPolicy));
+        // <FS:Ansariel> Fix adapter naming
+        //httpAdapter(new LLCoreHttpUtil::HttpCoroutineAdapter("groupMembersRequest", httpPolicy));
+        httpAdapter(new LLCoreHttpUtil::HttpCoroutineAdapter("untrustedSimulatorMessage", httpPolicy));
+        // </FS:Ansariel>
    LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest);
    LLCore::HttpOptions::ptr_t httpOpts = LLCore::HttpOptions::ptr_t(new LLCore::HttpOptions);

--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@ -690,17 +690,26 @@ bool LLGLManager::initGL()
 		glGetIntegerv(GL_TEXTURE_FREE_MEMORY_ATI, meminfo);

 		mVRAM = meminfo[0]/1024;
+
+		// <FS:Ansariel> VRAM detection logging
+		LL_INFOS("RenderInit") << "VRAM detected via ATI MemInfo OpenGL extension: " << mVRAM << " MB" << LL_ENDL;
 	}
 	else if (mHasNVXMemInfo)
 	{
 		S32 dedicated_memory;
 		glGetIntegerv(GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX, &dedicated_memory);
 		mVRAM = dedicated_memory/1024;
+
+		// <FS:Ansariel> VRAM detection logging
+		LL_INFOS("RenderInit") << "VRAM detected via nVidia MemInfo OpenGL extension: " << mVRAM << " MB" << LL_ENDL;
 	}

 	if (mVRAM < 256)
 	{ //something likely went wrong using the above extensions, fall back to old method
 		mVRAM = old_vram;
+
+		// <FS:Ansariel> VRAM detection logging
+		LL_WARNS("RenderInit") << "VRAM detected via MemInfo OpenGL extension most likely broken. Reverting to " << mVRAM << " MB" << LL_ENDL;
 	}

 	stop_glerror();
--- a/indra/llwindow/lldxhardware.cpp
+++ b/indra/llwindow/lldxhardware.cpp
@ -534,6 +534,7 @@ BOOL LLDXHardware::getInfo(BOOL vram_only, bool disable_wmi)
 		// </FS:Ansariel>
 		{
 			mVRAM = vram/(1024*1024);
+			LL_INFOS("AppInit") << "VRAM Detected via WMI: " << mVRAM << LL_ENDL;
 		}
 		else
 		{ // Get the English VRAM string
@ -545,7 +546,7 @@ BOOL LLDXHardware::getInfo(BOOL vram_only, bool disable_wmi)
 		  // Dump the string as an int into the structure
 		  char *stopstring;
 		  mVRAM = strtol(ram_str.c_str(), &stopstring, 10); 
-		  LL_INFOS("AppInit") << "VRAM Detected: " << mVRAM << " DX9 string: " << ram_str << LL_ENDL;
+		  LL_INFOS("AppInit") << "VRAM Detected via DirectX: " << mVRAM << " DX9 string: " << ram_str << LL_ENDL;
 		}

 		if (vram_only)
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@ -60,7 +60,6 @@
 						-->
 						     <string>import</string>
 						     <string>export</string>
-						     <string>fsdata</string>
 							 <string>SLURL</string>
 							 <string>Outfit</string>
 						</array>
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@ -22687,7 +22687,7 @@ Change of this parameter will affect the layout of buttons in notification toast
    <key>FSFlashOnMessage</key>
    <map>
      <key>Comment</key>
-      <string>Flash/Bounce the app icon when a new message is recieved and Firestorm is not in focus</string>
+      <string>Flash/Bounce the app icon when a new message is received and Firestorm is not in focus</string>
      <key>Persist</key>
      <integer>1</integer>
      <key>Type</key>
@ -22695,6 +22695,17 @@ Change of this parameter will affect the layout of buttons in notification toast
      <key>Value</key>
      <integer>0</integer>
    </map>
+    <key>FSFlashOnObjectIM</key>
+    <map>
+      <key>Comment</key>
+      <string>Flash/Bounce the app icon when a new instant message from an object is received and Firestorm is not in focus.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
    <key>FSDisableReturnObjectNotification</key>
    <map>
      <key>Comment</key>
@ -24086,6 +24097,17 @@ Change of this parameter will affect the layout of buttons in notification toast
      <key>Value</key>
      <integer>0</integer>
    </map>
+    <key>FSStatusBarMenuButtonPopupOnRollover</key>
+    <map>
+      <key>Comment</key>
+      <string>Enable rollover popups on top status bar menu icons: Quick Graphics Presets, Volume, and Media.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
  </map>
 </llsd>

--- a/indra/newview/fscommon.cpp
+++ b/indra/newview/fscommon.cpp
@ -325,7 +325,7 @@ bool FSCommon::checkIsActionEnabled(const LLUUID& av_id, EFSRegistrarFunctionAct
 	}
 	else if (action == FS_RGSTR_ACT_ZOOM_IN)
 	{
-		return (!isSelf && LLAvatarActions::canZoomIn(av_id));
+		return (!isSelf && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) && LLAvatarActions::canZoomIn(av_id));
 	}
 	else if (action == FS_RGSTR_ACT_OFFER_TELEPORT)
 	{
--- a/indra/newview/fsfloaterim.cpp
+++ b/indra/newview/fsfloaterim.cpp
@ -2359,6 +2359,9 @@ void FSFloaterIM::handleMinimized(bool minimized)
 	else
 	{
 		gConsole->addSession(mSessionID);
-		updateMessages();
+		if (mChatHistory)
+		{
+			updateMessages();
+		}
 	}
 }
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@ -1984,17 +1984,20 @@ bool LLAppearanceMgr::getCanReplaceCOF(const LLUUID& outfit_cat_id)
 		return false;
 	}

+// <FS:KC> FIRE-11920: Always allow replacing outfit
 	// Check whether the outfit contains any wearables we aren't wearing already (STORM-702).
-	LLInventoryModel::cat_array_t cats;
-	LLInventoryModel::item_array_t items;
-	LLFindWearablesEx is_worn(/*is_worn=*/ false, /*include_body_parts=*/ true);
-	gInventory.collectDescendentsIf(outfit_cat_id,
-		cats,
-		items,
-		LLInventoryModel::EXCLUDE_TRASH,
-		is_worn);
+//	LLInventoryModel::cat_array_t cats;
+//	LLInventoryModel::item_array_t items;
+//	LLFindWearablesEx is_worn(/*is_worn=*/ false, /*include_body_parts=*/ true);
+//	gInventory.collectDescendentsIf(outfit_cat_id,
+//		cats,
+//		items,
+//		LLInventoryModel::EXCLUDE_TRASH,
+//		is_worn);

-	return items.size() > 0;
+//	return items.size() > 0;
+	return TRUE;
+// </FS:KC> FIRE-11920: Always allow replacing outfit
 }

 // Moved from LLWearableList::ContextMenu for wider utility.
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@ -1159,30 +1159,6 @@ bool LLAppViewer::init()
 		return false;
 	}

-	// <FS:Ansariel> Texture memory management
-	// On 64bit builds, allow up to 1GB texture memory on cards with 2GB video
-	// memory and up to 2GB texture memory on cards with 4GB video memory. Check
-	// is performed against a lower limit as not exactly 2 or 4GB might not be
-	// returned.
-#ifdef ND_BUILD64BIT_ARCH
-	if (gGLManager.mVRAM > 3584)
-	{
-		gMaxVideoRam = S32Megabytes(2048);
-		LL_INFOS() << "At least 4 GB video memory detected - increasing max video ram to " << gMaxVideoRam.value() << " MB" << LL_ENDL;
-	}
-	else if (gGLManager.mVRAM > 1536)
-	{
-		gMaxVideoRam = S32Megabytes(1024);
-		LL_INFOS() << "At least 2 GB video memory detected - increasing max video ram to " << gMaxVideoRam.value() << " MB" << LL_ENDL;
-	}
-	else if (gGLManager.mVRAM > 768)
-	{
-		gMaxVideoRam = S32Megabytes(768);
-		LL_INFOS() << "At least 1 GB video memory detected - increasing max video ram to " << gMaxVideoRam.value() << " MB" << LL_ENDL;
-	}
-#endif
-	// </FS:Ansariel>
-
 	LL_INFOS("InitInfo") << "Hardware test initialization done." << LL_ENDL ;

 	// Prepare for out-of-memory situations, during which we will crash on
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@ -563,7 +563,7 @@ void LLAvatarActions::teleport_request_callback(const LLSD& notification, const
 		std::string strMessage = response["message"];

 		// Filter the request message if the recipients is IM-blocked
-		if ( (!RlvActions::isRlvEnabled()) || ((RlvActions::canStartIM(idRecipient)) && (RlvActions::canSendIM(idRecipient))) )
+		if ( (RlvActions::isRlvEnabled()) && ((!RlvActions::canStartIM(idRecipient)) || (!RlvActions::canSendIM(idRecipient))) )
 		{
 			strMessage = RlvStrings::getString(RLV_STRING_HIDDEN);
 		}
--- a/indra/newview/lleventpoll.cpp
+++ b/indra/newview/lleventpoll.cpp
@ -44,6 +44,8 @@

 #include "llsdutil.h" // <FS:ND/> for ll_pretty_print_sd

+#include "boost/make_shared.hpp"
+
 namespace LLEventPolling
 {
 namespace Details
@ -72,6 +74,7 @@ namespace Details
        bool                            mDone;
        LLCore::HttpRequest::ptr_t      mHttpRequest;
        LLCore::HttpRequest::policy_t   mHttpPolicy;
+        LLCore::HttpOptions::ptr_t      mHttpOptions; // <FS:Ansariel> Restore pre-coro behavior (60s timeout, no retries)
        std::string                     mSenderIp;
        int                             mCounter;
        LLCoreHttpUtil::HttpCoroutineAdapter::wptr_t mAdapter;
@ -91,6 +94,7 @@ namespace Details
        mDone(false),
        mHttpRequest(),
        mHttpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID),
+        mHttpOptions(), // <FS:Ansariel> Restore pre-coro behavior (60s timeout, no retries)
        mSenderIp(),
        mCounter(sNextCounter++)

@ -99,6 +103,11 @@ namespace Details

        mHttpRequest = LLCore::HttpRequest::ptr_t(new LLCore::HttpRequest);
        mHttpPolicy = app_core_http.getPolicy(LLAppCoreHttp::AP_LONG_POLL);
+        // <FS:Ansariel> Restore pre-coro behavior (60s timeout, no retries)
+        mHttpOptions = LLCore::HttpOptions::ptr_t(new LLCore::HttpOptions);
+        mHttpOptions->setRetries(0);
+        mHttpOptions->setTransferTimeout(60);
+        // </FS:Ansariel>
        mSenderIp = sender.getIPandPort();
    }

@ -170,7 +179,10 @@ namespace Details
 //              << LLSDXMLStreamer(request) << LL_ENDL;

            LL_DEBUGS("LLEventPollImpl") << " <" << counter << "> posting and yielding." << LL_ENDL;
-            LLSD result = httpAdapter->postAndSuspend(mHttpRequest, url, request);
+            // <FS:Ansariel> Restore pre-coro behavior (60s timeout, no retries)
+            //LLSD result = httpAdapter->postAndSuspend(mHttpRequest, url, request);
+            LLSD result = httpAdapter->postAndSuspend(mHttpRequest, url, request, mHttpOptions);
+            // </FS:Ansariel>

 //          LL_DEBUGS("LLEventPollImpl::eventPollCoro") << "<" << counter << "> result = "
 //              << LLSDXMLStreamer(result) << LL_ENDL;
@ -186,6 +198,15 @@ namespace Details
                    errorCount = 0;
                    continue;
                }
+                // <FS:Ansariel> Restore pre-coro behavior (60s timeout, no retries)
+                else if (status == LLCore::HttpStatus(HTTP_BAD_GATEWAY))
+                {   // Pre-coro says this is the default answer for timeouts and it can happen
+                    // frequently on OpenSim - assume this is normal and issue a new request immediately
+                    LL_INFOS("LLEventPollImpl") << "Received HTTP 502 - start new request." << LL_ENDL;
+                    errorCount = 0;
+                    continue;
+                }
+                // </FS:Ansariel>
                else if ((status == LLCore::HttpStatus(LLCore::HttpStatus::LLCORE, LLCore::HE_OP_CANCELED)) || 
                        (status == LLCore::HttpStatus(HTTP_NOT_FOUND)))
                {   // Event polling for this server has been canceled.  In 
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@ -293,7 +293,8 @@ void LLFace::setTexture(U32 ch, LLViewerTexture* tex)
 	if ( (LLRender::DIFFUSE_MAP == ch) && (!mShowDiffTexture) )
 	{
 		mOrigDiffTexture = tex;
-		return;
+		if (LLViewerFetchedTexture::sDefaultDiffuseImagep.get() == mTexture[ch].get())
+			return;
 	}
 // [/SL:KB]

--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@ -3621,9 +3621,11 @@ BOOL LLPanelPreference::postBuild()
 	// <FS:Ansariel> Only enable Growl checkboxes if Growl is usable
 	if (hasChild("notify_growl_checkbox", TRUE))
 	{
+		BOOL growl_enabled = gSavedSettings.getBOOL("FSEnableGrowl") && GrowlManager::isUsable();
 		getChild<LLCheckBoxCtrl>("notify_growl_checkbox")->setCommitCallback(boost::bind(&LLPanelPreference::onEnableGrowlChanged, this));
 		getChild<LLCheckBoxCtrl>("notify_growl_checkbox")->setEnabled(GrowlManager::isUsable());
-		getChild<LLCheckBoxCtrl>("notify_growl_always_checkbox")->setEnabled(gSavedSettings.getBOOL("FSEnableGrowl") && GrowlManager::isUsable());
+		getChild<LLCheckBoxCtrl>("notify_growl_always_checkbox")->setEnabled(growl_enabled);
+		getChild<LLCheckBoxCtrl>("FSFilterGrowlKeywordDuplicateIMs")->setEnabled(growl_enabled);
 	}
 	// </FS:Ansariel>

@ -3727,7 +3729,9 @@ void LLPanelPreference::handleFavoritesOnLoginChanged(LLUICtrl* checkbox, const
 // <FS:Ansariel> Only enable Growl checkboxes if Growl is usable
 void LLPanelPreference::onEnableGrowlChanged()
 {
-	getChild<LLCheckBoxCtrl>("notify_growl_always_checkbox")->setEnabled(gSavedSettings.getBOOL("FSEnableGrowl") && GrowlManager::isUsable());
+	BOOL growl_enabled = gSavedSettings.getBOOL("FSEnableGrowl") && GrowlManager::isUsable();
+	getChild<LLCheckBoxCtrl>("notify_growl_always_checkbox")->setEnabled(growl_enabled);
+	getChild<LLCheckBoxCtrl>("FSFilterGrowlKeywordDuplicateIMs")->setEnabled(growl_enabled);
 }
 // </FS:Ansariel>

--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@ -1026,7 +1026,12 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item, U32 mask)
 			if( item_array )
 			{
 				// *FIX: bit of a hack to call update server from here...
-				new_item->updateServer(TRUE);
+				// <FS:KB> FIRE-19635 / BUG-20161: Detached object ends up in root of inventory
+				//new_item->updateServer(TRUE);
+				LLInventoryModel::LLCategoryUpdate update(category_id, 1);
+				gInventory.accountForUpdate(update);
+				new_item->updateParentOnServer(FALSE);
+				// </FS:KB>
 				item_array->push_back(new_item);
 			}
 			else
@ -1069,7 +1074,12 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item, U32 mask)
 				{
 					// *FIX: bit of a hack to call update server from
 					// here...
-					new_item->updateServer(TRUE);
+					// <FS:KB> FIRE-19635 / BUG-20161: Detached object ends up in root of inventory
+					//new_item->updateServer(TRUE);
+					LLInventoryModel::LLCategoryUpdate update(parent_id, 1);
+					gInventory.accountForUpdate(update);
+					new_item->updateParentOnServer(FALSE);
+					// </FS:KB>
 					item_array->push_back(new_item);
 				}
 				else
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@ -195,7 +195,12 @@ LLStatusBar::LLStatusBar(const LLRect& rect)
 	mNearbyIcons(FALSE),		// <FS:Ansariel> Script debug
 	mSearchData(NULL),			// <FS:ND/> Hook up and init for filtering
 	mFilterEdit(NULL),			// <FS:ND/> Edit for filtering
-	mSearchPanel(NULL)			// <FS:ND/> Panel for filtering
+	mSearchPanel(NULL),			// <FS:ND/> Panel for filtering
+	mIconPresets(NULL),
+	mMediaToggle(NULL),
+	mMouseEnterPresetsConnection(),
+	mMouseEnterVolumeConnection(),
+	mMouseEnterNearbyMediaConnection()
 {
 	setRect(rect);
 	
@ -244,6 +249,22 @@ LLStatusBar::~LLStatusBar()
 	{
 		mShowCoordsCtrlConnection.disconnect();
 	}
+
+	// <FS:Ansariel> FIRE-19697: Add setting to disable graphics preset menu popup on mouse over
+	if (mMouseEnterPresetsConnection.connected())
+	{
+		mMouseEnterPresetsConnection.disconnect();
+	}
+	if (mMouseEnterVolumeConnection.connected())
+	{
+		mMouseEnterVolumeConnection.disconnect();
+	}
+	if (mMouseEnterNearbyMediaConnection.connected())
+	{
+		mMouseEnterNearbyMediaConnection.disconnect();
+	}
+	// </FS:Ansariel>
+
 	// LLView destructor cleans up children
 }

@ -285,26 +306,47 @@ BOOL LLStatusBar::postBuild()
 	//mBtnStats = getChildView("stat_btn");

 	mIconPresets = getChild<LLButton>( "presets_icon" );
-	mIconPresets->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterPresets, this));
+    // <FS: KC> FIRE-19697: Add setting to disable graphics preset menu popup on mouse over
+	// mIconPresets->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterPresets, this));
+    if (gSavedSettings.getBOOL("FSStatusBarMenuButtonPopupOnRollover"))
+    {
+        mMouseEnterPresetsConnection = mIconPresets->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterPresets, this));
+    }
+    // </FS: KC> FIRE-19697: Add setting to disable graphics preset menu popup on mouse over
 	mIconPresets->setClickedCallback(boost::bind(&LLStatusBar::onMouseEnterPresets, this));

 	mBtnVolume = getChild<LLButton>( "volume_btn" );
 	mBtnVolume->setClickedCallback( onClickVolume, this );
-	mBtnVolume->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterVolume, this));
+    // <FS: KC> FIRE-19697: Add setting to disable status bar icon menu popup on mouseover
+	// mBtnVolume->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterVolume, this));
+    if (gSavedSettings.getBOOL("FSStatusBarMenuButtonPopupOnRollover"))
+    {
+        mMouseEnterVolumeConnection = mBtnVolume->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterVolume, this));
+    }
+    // </FS: KC> FIRE-19697: Add setting to disable status bar icon menu popup on mouseover

-	// ## Zi: Media/Stream separation
+	// <FS:Zi> Media/Stream separation
 	mStreamToggle = getChild<LLButton>("stream_toggle_btn");
-	mStreamToggle->setClickedCallback( &LLStatusBar::onClickStreamToggle, this );
-	// ## Zi: Media/Stream separation
+	mStreamToggle->setClickedCallback(&LLStatusBar::onClickStreamToggle, this);
+	// </FS:Zi> Media/Stream separation

 	mMediaToggle = getChild<LLButton>("media_toggle_btn");
 	mMediaToggle->setClickedCallback( &LLStatusBar::onClickMediaToggle, this );
-	mMediaToggle->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterNearbyMedia, this));
+    // <FS: KC> FIRE-19697: Add setting to disable status bar icon menu popup on mouseover
+    // mMediaToggle->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterNearbyMedia, this));
+    if (gSavedSettings.getBOOL("FSStatusBarMenuButtonPopupOnRollover"))
+    {
+        mMouseEnterNearbyMediaConnection = mMediaToggle->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterNearbyMedia, this));
+    }
+    // </FS: KC> FIRE-19697: Add setting to disable status bar icon menu popup on mouseover

 	LLHints::registerHintTarget("linden_balance", getChild<LLView>("balance_bg")->getHandle());

 	gSavedSettings.getControl("MuteAudio")->getSignal()->connect(boost::bind(&LLStatusBar::onVolumeChanged, this, _2));

+	// <FS:Ansariel> FIRE-19697: Add setting to disable graphics preset menu popup on mouse over
+	gSavedSettings.getControl("FSStatusBarMenuButtonPopupOnRollover")->getSignal()->connect(boost::bind(&LLStatusBar::onPopupRolloverChanged, this, _2));
+
 	// Adding Net Stat Graph
 	S32 x = getRect().getWidth() - 2;
 	S32 y = 0;
@ -1373,7 +1415,7 @@ void LLStatusBar::onParcelIconClick(EParcelIcon icon)
 	case PATHFINDING_DIRTY_ICON:
 		// <FS:Zi> Pathfinding rebake functions
 		// LLNotificationsUtil::add("PathfindingDirty");
-		LLNotificationsUtil::add("PathfindingDirty",LLSD(),LLSD(),boost::bind(&LLStatusBar::rebakeRegionCallback,this,_1,_2));
+		LLNotificationsUtil::add("PathfindingDirty", LLSD(), LLSD(), boost::bind(&LLStatusBar::rebakeRegionCallback, this, _1, _2));
 		// </FS:Zi>
 		break;
 	case PATHFINDING_DISABLED_ICON:
@ -1500,10 +1542,9 @@ void LLStatusBar::updateVolumeControlsVisibility(const LLSD& data)
 // </FS:PP>

 // <FS:Zi> Pathfinding rebake functions
-BOOL LLStatusBar::rebakeRegionCallback(const LLSD& notification,const LLSD& response)
+BOOL LLStatusBar::rebakeRegionCallback(const LLSD& notification, const LLSD& response)
 {
-	std::string newSetName = response["message"].asString();
-	S32 option = LLNotificationsUtil::getSelectedOption(notification,response);
+	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);

 	if (option == 0)
 	{
@ -1582,3 +1623,29 @@ void LLStatusBar::updateMenuSearchVisibility(const LLSD& data)
 	}
 	update();
 }
+
+// <FS:Ansariel> FIRE-19697: Add setting to disable graphics preset menu popup on mouse over
+void LLStatusBar::onPopupRolloverChanged(const LLSD& newvalue)
+{
+	bool new_value = newvalue.asBoolean();
+
+	if (mMouseEnterPresetsConnection.connected())
+	{
+		mMouseEnterPresetsConnection.disconnect();
+	}
+	if (mMouseEnterVolumeConnection.connected())
+	{
+		mMouseEnterVolumeConnection.disconnect();
+	}
+	if (mMouseEnterNearbyMediaConnection.connected())
+	{
+		mMouseEnterNearbyMediaConnection.disconnect();
+	}
+
+	if (new_value)
+	{
+		mMouseEnterPresetsConnection = mIconPresets->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterPresets, this));
+		mMouseEnterVolumeConnection = mBtnVolume->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterVolume, this));
+		mMouseEnterNearbyMediaConnection = mMediaToggle->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterNearbyMedia, this));
+	}
+}
--- a/indra/newview/llstatusbar.h
+++ b/indra/newview/llstatusbar.h
@ -261,6 +261,10 @@ private:
 	void onNavMeshStatusChange(const LLPathfindingNavMeshStatus &pNavMeshStatus);
 	void createNavMeshStatusListenerForCurrentRegion();
 	// </FS:Ansariel> Pathfinding support
+
+	// <FS:Ansariel> FIRE-19697: Add setting to disable graphics preset menu popup on mouse over
+	void onPopupRolloverChanged(const LLSD& newvalue);
+
 public:

 	/**
@ -362,6 +366,12 @@ private:
 	boost::signals2::connection	mShowCoordsCtrlConnection;
 	boost::signals2::connection	mParcelMgrConnection;

+	// <FS:Ansariel> FIRE-19697: Add setting to disable graphics preset menu popup on mouse over
+	boost::signals2::connection mMouseEnterPresetsConnection;
+	boost::signals2::connection mMouseEnterVolumeConnection;
+	boost::signals2::connection mMouseEnterNearbyMediaConnection;
+	// </FS:Ansariel>
+
 	// <FS:Zi> Pathfinding rebake functions
 	BOOL			rebakeRegionCallback(const LLSD& notification,const LLSD& response);

--- a/indra/newview/llviewerkeyboard.cpp
+++ b/indra/newview/llviewerkeyboard.cpp
@ -50,6 +50,7 @@
 #include "rlvhandler.h"
 // [/RLVa:KB]
 #include "llfloaterwebcontent.h"
+#include "fsfloatersearch.h"

 //
 // Constants
@ -631,7 +632,7 @@ void start_gesture( EKeystate s )

 	// <FS:Ansariel> FIRE-4167: Don't start gesture if a floater with web content has focus
 	LLFloater* focused_floater = gFloaterView->getFocusedFloater();
-	if (focused_floater && dynamic_cast<LLFloaterWebContent*>(focused_floater))
+	if (focused_floater && (dynamic_cast<LLFloaterWebContent*>(focused_floater) || dynamic_cast<FSFloaterSearch*>(focused_floater)))
 	{
 		return;
 	}
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@ -3057,7 +3057,10 @@ void LLViewerMediaImpl::updateImagesMediaStreams()
 //////////////////////////////////////////////////////////////////////////////////////////
 LLViewerMediaTexture* LLViewerMediaImpl::updatePlaceholderImage()
 {
-	if(mTextureId.isNull())
+//	if(mTextureId.isNull())
+// [SL:KB] - Patch: Render-TextureToggle (Catznip-4.0)
+	if ( (mTextureId.isNull()) || ((LLViewerFetchedTexture::sDefaultDiffuseImagep.notNull()) && (LLViewerFetchedTexture::sDefaultDiffuseImagep->getID() == mTextureId)) )
+// [/SL:KB]
 	{
 		// The code that created this instance will read from the plugin's bits.
 		return NULL;
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@ -7508,6 +7508,13 @@ void handle_viewer_disable_message_log(void*)

 void handle_customize_avatar()
 {
+	// <FS:Ansariel> FIRE-19614: Make CTRL-O toggle the appearance floater
+	if (LLFloaterReg::instanceVisible("appearance"))
+	{
+		LLFloaterReg::hideInstance("appearance");
+	}
+	else
+	// </FS:Ansariel>
 	LLFloaterSidePanelContainer::showPanel("appearance", LLSD().with("type", "my_outfits"));
 }

--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@ -2748,17 +2748,17 @@ static void teleport_region_info_cb(const std::string& slurl, LLSD args, const L

 	if (!can_user_access_dst_region)
 	{
-		params.name = "TeleportOffered_MaturityBlocked";
+		params.name = "TeleportOffered_MaturityBlocked_SLUrl";
 		send_simple_im(from_id, LLTrans::getString("TeleportMaturityExceeded"), IM_NOTHING_SPECIAL, session_id);
 		send_simple_im(from_id, LLStringUtil::null, IM_LURE_DECLINED, session_id);
 	}
 	else if (does_user_require_maturity_increase)
 	{
-		params.name = "TeleportOffered_MaturityExceeded";
+		params.name = "TeleportOffered_MaturityExceeded_SLUrl";
 	}
 	else
 	{
-		params.name = "TeleportOffered";
+		params.name = "TeleportOffered_SLUrl";
 		params.functor.name = "TeleportOffered";
 	}

@ -3935,7 +3935,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				payload["region_maturity"] = region_access;

 				// <FS:Ansariel> FIRE-6786: Always show teleport location in teleport offer
-				if (dialog == IM_LURE_USER && (!rlv_handler_t::isEnabled() || !fRlvAutoAccept))
+				if (dialog == IM_LURE_USER && (!rlv_handler_t::isEnabled() || !fRlvAutoAccept) && LLGridManager::instance().isInSecondLife())
 				{
 					LLVector3d pos_global = from_region_handle(region_handle);
 					pos_global += LLVector3d(pos);
@ -4209,7 +4209,8 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	// <FS:CR> Make osx dashboard icon bounce when window isn't in focus
 	//if (viewer_window && viewer_window->getMinimized())
 	static LLCachedControl<bool> sFlashIcon(gSavedSettings, "FSFlashOnMessage");
-	if (viewer_window && dialog != IM_TYPING_START && dialog != IM_TYPING_STOP && sFlashIcon)
+	static LLCachedControl<bool> sFSFlashOnObjectIM(gSavedSettings, "FSFlashOnObjectIM");
+	if (viewer_window && dialog != IM_TYPING_START && dialog != IM_TYPING_STOP && sFlashIcon && (sFSFlashOnObjectIM || (chat.mChatType != CHAT_TYPE_IM)))
 	{
 		viewer_window->flashIcon(5.f);
 	}
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@ -1877,6 +1877,32 @@ LLViewerWindow::LLViewerWindow(const Params& p)
 		LLFeatureManager::getInstance()->setGraphicsLevel(0, false);
 		gSavedSettings.setU32("RenderQualityPerformance", 0);		
 	}
+
+	// <FS:Ansariel> Texture memory management
+	// On 64bit builds, allow up to 1GB texture memory on cards with 2GB video
+	// memory and up to 2GB texture memory on cards with 4GB video memory. Check
+	// is performed against a lower limit as not exactly 2 or 4GB might not be
+	// returned.
+#ifdef ND_BUILD64BIT_ARCH
+	LL_INFOS() << "GLManager detected " << gGLManager.mVRAM << " MB VRAM" << LL_ENDL;
+
+	if (gGLManager.mVRAM > 3584)
+	{
+		gMaxVideoRam = S32Megabytes(2048);
+		LL_INFOS() << "At least 4 GB video memory detected - increasing max video ram for textures to 2048 MB" << LL_ENDL;
+	}
+	else if (gGLManager.mVRAM > 1536)
+	{
+		gMaxVideoRam = S32Megabytes(1024);
+		LL_INFOS() << "At least 2 GB video memory detected - increasing max video ram for textures to 1024 MB" << LL_ENDL;
+	}
+	else if (gGLManager.mVRAM > 768)
+	{
+		gMaxVideoRam = S32Megabytes(768);
+		LL_INFOS() << "At least 1 GB video memory detected - increasing max video ram for textures to 768 MB" << LL_ENDL;
+	}
+#endif
+	// </FS:Ansariel>
 		
 	// Init the image list.  Must happen after GL is initialized and before the images that
 	// LLViewerWindow needs are requested.
--- a/indra/newview/skins/ansastorm/themes/blood/colors.xml
+++ b/indra/newview/skins/ansastorm/themes/blood/colors.xml
@ -327,7 +327,7 @@
     value="0.04 0.04 0.04 1.0" />
    <color
     name="PieMenuLineColor"
-     value="0 0.2 0 0.5" />
+     value="0.2 0 0 0.5" />
    <color
     name="PieMenuTextColor"
     reference="White" />
--- a/indra/newview/skins/default/xui/da/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/da/menu_viewer.xml
@ -5,7 +5,7 @@
 		<menu_item_call label="Mit instrumentpanel" name="Manage My Account"/>
 		<menu_item_call label="Køb L$" name="Buy and Sell L$"/>
 		<menu_item_call label="Profil" name="Profile"/>
-		<menu_item_call label="Udseende" name="ChangeOutfit"/>
+		<menu_item_check label="Udseende" name="ChangeOutfit"/>
 		<menu_item_check label="Beholdning" name="Inventory"/>
 		<menu_item_check label="Min beholdning" name="ShowSidetrayInventory"/>
 		<menu_item_check label="Mine bevægelser" name="Gestures"/>
--- a/indra/newview/skins/default/xui/da/notifications.xml
+++ b/indra/newview/skins/default/xui/da/notifications.xml
@ -1369,6 +1369,15 @@ Prøv igen om lidt.
 		</form>
 	</notification>
 	<notification name="TeleportOffered">
+		[NAME_SLURL] har tilbudt en teleport til deres lokation:
+
+[MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
+		<form name="form">
+			<button name="Teleport" text="Teleportér"/>
+			<button name="Cancel" text="Annullér"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_SLUrl">
 		[NAME_SLURL] har tilbudt en teleport til deres lokation ([POS_SLURL]):

 [MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@ -11,7 +11,7 @@
 		<menu_item_call label="Auswahlen" name="Picks"/>
 		<menu_item_call label="Erlebnisse" name="Experiences"/>
 		<menu_item_call label="Profil" name="Profile"/>
-		<menu_item_call label="Aussehen" name="ChangeOutfit"/>
+		<menu_item_check label="Aussehen" name="ChangeOutfit"/>
 		<menu_item_call label="Avatar auswählen" name="Avatar Picker"/>
 		<menu label="Bewegung" name="Movement">
 			<menu_item_call label="Hinsetzen" name="Sit Down Here"/>
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@ -3061,7 +3061,7 @@ Versuchen Sie es in einigen Minuten erneut.
 		</form>
 	</notification>
 	<notification name="TeleportOffered">
-		[NAME_SLURL] hat Ihnen den Teleport an seinen/ihren Standort ([POS_SLURL]) angeboten:
+		[NAME_SLURL] hat Ihnen den Teleport an seinen/ihren Standort angeboten:

 [MESSAGE]
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; – [MATURITY_STR]
@ -3071,7 +3071,7 @@ Versuchen Sie es in einigen Minuten erneut.
 		</form>
 	</notification>
 	<notification name="TeleportOffered_MaturityExceeded">
-		[NAME_SLURL] hat Ihnen den Teleport an seinen/ihren Standort ([POS_SLURL]) angeboten:
+		[NAME_SLURL] hat Ihnen den Teleport an seinen/ihren Standort angeboten:

 [MESSAGE]
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; – [MATURITY_STR]
@ -3083,6 +3083,36 @@ Diese Region enthält [REGION_CONTENT_MATURITY]-Inhalte, doch aufgrund Ihrer akt
 		</form>
 	</notification>
 	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] hat Ihnen den Teleport an seinen/ihren Standort angeboten:
+
+[MESSAGE]
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; – [MATURITY_STR]
+
+Diese Region enthält jedoch Inhalte, die nur für Erwachsene zugänglich sind.
+	</notification>
+	<notification name="TeleportOffered_SLUrl">
+		[NAME_SLURL] hat Ihnen den Teleport an seinen/ihren Standort ([POS_SLURL]) angeboten:
+
+[MESSAGE]
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; – [MATURITY_STR]
+		<form name="form">
+			<button name="Teleport" text="Teleportieren"/>
+			<button name="Cancel" text="Abbrechen"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityExceeded_SLUrl">
+		[NAME_SLURL] hat Ihnen den Teleport an seinen/ihren Standort ([POS_SLURL]) angeboten:
+
+[MESSAGE]
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; – [MATURITY_STR]
+
+Diese Region enthält [REGION_CONTENT_MATURITY]-Inhalte, doch aufgrund Ihrer aktuellen Einstellungen werden [REGION_CONTENT_MATURITY]-Inhalte nicht dargestellt. Sie können Ihre Einstellungen ändern und den Teleport fortsetzen oder Sie können den Teleport abbrechen.
+		<form name="form">
+			<button name="Teleport" text="Ändern und fortfahren"/>
+			<button name="Cancel" text="Abbrechen"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked_SLUrl">
 		[NAME_SLURL] hat Ihnen den Teleport an seinen/ihren Standort ([POS_SLURL]) angeboten:

 [MESSAGE]
--- a/indra/newview/skins/default/xui/de/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_UI.xml
@ -90,6 +90,7 @@
 		<check_box label="Position in Menüleiste anzeigen" name="ShowMenuBarLocation" />
 		<check_box label="Menüsuche anzeigen" name="show_search_menu_check"/>
 		<check_box label="Kontostand anzeigen" name="FSShowCurrencyBalanceInStatusbar"/>
+		<check_box label="Popup-Fenster beim Überfahren der Icons mit der Maus in der Statusleiste aktivieren" name="FSStatusBarMenuButtonPopupOnRollover"/>
 		<text name="navfav_textbox">
 			Navigations- und Favoriten-Leiste:
 		</text>
--- a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
@ -1,66 +1,65 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Popups" name="popups" title="Popups">
-<tab_container name="tabs">
- 
-    <!-- World -->
-    <panel label="Welt" name="tab-world">
-	<check_box label="Benachrichtigen, wenn ich L$ ausgebe oder erhalte" name="notify_money_change_checkbox"/>
-	<check_box name="FSPaymentInfoInChat" label="Bei L$-Transaktionen im lokalen Chat benachrichtigen"/>
-	<check_box label="Benachrichtigen, wenn sich der Simulator-Kanal beim Regionswechsel ändert" name="FSShowServerVersionChangeNotice" tool_tip="Zeigt an, falls sich beim einem Wechsel der Region oder durch einen Teleport die Version des Simulators ändert, auf dem die Region läuft."/>
-	<check_box label="Aktuelle Neuigkeiten von status.secondlifegrid.net beim Login abrufen" name="AutoQueryGridStatus"/>
-	<check_box label="Growl-Benachrichtigungen aktivieren" name="notify_growl_checkbox"/>
-	<check_box label="Growl nutzen auch wenn Firestorm aktiv ist" name="notify_growl_always_checkbox"/>
-	<check_box label="Doppelte IM-Nachrichten filtern, wenn sie bereits als Schlüsselwort-Alarm angezeigt wurden" name="FSFilterGrowlKeywordDuplicateIMs"/>
-    </panel>
+	<tab_container name="tabs">
+		<!-- World -->
+		<panel label="Welt" name="tab-world">
+			<check_box label="Benachrichtigen, wenn ich L$ ausgebe oder erhalte" name="notify_money_change_checkbox"/>
+			<check_box name="FSPaymentInfoInChat" label="Bei L$-Transaktionen im lokalen Chat benachrichtigen"/>
+			<check_box label="Benachrichtigen, wenn sich der Simulator-Kanal beim Regionswechsel ändert" name="FSShowServerVersionChangeNotice" tool_tip="Zeigt an, falls sich beim einem Wechsel der Region oder durch einen Teleport die Version des Simulators ändert, auf dem die Region läuft."/>
+			<check_box label="Aktuelle Neuigkeiten von status.secondlifegrid.net beim Login abrufen" name="AutoQueryGridStatus"/>
+			<check_box label="Growl-Benachrichtigungen aktivieren" name="notify_growl_checkbox"/>
+			<check_box label="Growl nutzen auch wenn Firestorm aktiv ist" name="notify_growl_always_checkbox"/>
+			<check_box label="Doppelte IM-Nachrichten filtern, wenn sie bereits als Schlüsselwort-Alarm angezeigt wurden" name="FSFilterGrowlKeywordDuplicateIMs"/>
+		</panel>

-    <!-- People -->
-    <panel label="Leute" name="tab-people">
-	<check_box label="Anwendungsicon blinkt bei neuen Nachrichten, wenn [APP_NAME] keinen Fokus besitzt" name="FSFlashOnMessage"/>
-	<check_box label="Benachrichtigen, wenn jemand seinen Displaynamen ändert" name="FSShowDisplayNameUpdateNotification"/>
-	<check_box label="Benachrichtigen, wenn ich jemanden blockiere oder freischalte" name="FSReportBlockToNearbyChat"/>
-	<text name="friends_logon_label">
-		Anzeigen, wenn meine Freunden sich an- oder abmelden:
-	</text>
-	<check_box label="Als Toasts" name="friends_online_notify_checkbox"/>
-	<check_box name="OnlineOfflinetoNearbyChat" label="In lokalem Chat &amp; Konsole"/>
-	<check_box label="Nur in lokalem Chat" name="OnlineOfflinetoNearbyChatHistory"/>
-    </panel>
+		<!-- People -->
+		<panel label="Leute" name="tab-people">
+			<check_box label="Anwendungsicon blinkt bei neuen Nachrichten, wenn [APP_NAME] keinen Fokus besitzt" name="FSFlashOnMessage"/>
+			<check_box label="Benachrichtigen, wenn jemand seinen Displaynamen ändert" name="FSShowDisplayNameUpdateNotification"/>
+			<check_box label="Benachrichtigen, wenn ich jemanden blockiere oder freischalte" name="FSReportBlockToNearbyChat"/>
+			<text name="friends_logon_label">
+				Anzeigen, wenn meine Freunden sich an- oder abmelden:
+			</text>
+			<check_box label="Als Toasts" name="friends_online_notify_checkbox"/>
+			<check_box name="OnlineOfflinetoNearbyChat" label="In lokalem Chat &amp; Konsole"/>
+			<check_box label="Nur in lokalem Chat" name="OnlineOfflinetoNearbyChatHistory"/>
+		</panel>

-    <!-- Objects & Scripts -->
-    <panel label="Objekte &amp; Skripte" name="tab-objects">
-	<check_box label="Anwendungsicon blinkt bei neuen Skriptdialogen, wenn [APP_NAME] keinen Fokus besitzt" name="FSFlashOnScriptDialog"/>
-	<check_box label="Kollisionsmeldungen im Chat in der Nähe anzeigen" name="FSCollisionMessagesInChat"/>
-	<check_box label="Skriptfehler anzeigen in:" name="show_script_errors"/>
-	<radio_group name="show_script_errors_location">
-		<radio_item label="Lokaler Chat" name="script_0"/>
-		<radio_item label="Separates Fenster" name="script_1"/>
-	</radio_group>
-	<check_box label="Benachrichtigen, wenn sich die Skriptanzahl in der Region ändert:" name="FSReportTotalScriptCountChanges"/>
-	<spinner name="FSReportTotalScriptCountChangesThreshold" tool_tip="Der Schwellwert, ab dem Änderungen an der Skriptanzahl in der Region gemeldet werden [Standard: 100]"/>
-	<check_box label="Kollisionsmeldungen an Skripte senden. Kanal:" name="FSReportCollisionMessages"/>
-	<spinner name="FSReportCollisionMessagesChannel" tool_tip="Der Kanal, der verwendet wird, um Kollisionsmeldungen an Skripte zu senden [Standard: -25000]"/>
-    </panel>
+		<!-- Objects & Scripts -->
+		<panel label="Objekte &amp; Skripte" name="tab-objects">
+			<check_box label="Anwendungsicon blinkt bei neuen Skriptdialogen, wenn [APP_NAME] keinen Fokus besitzt" name="FSFlashOnScriptDialog"/>
+			<check_box label="Anwendungsicon blinkt ebenfalls, wenn Instant Messages von Objekten empfangen werden" name="FSFlashOnObjectIM"/>
+			<check_box label="Kollisionsmeldungen im Chat in der Nähe anzeigen" name="FSCollisionMessagesInChat"/>
+			<check_box label="Skriptfehler anzeigen in:" name="show_script_errors"/>
+			<radio_group name="show_script_errors_location">
+				<radio_item label="Lokaler Chat" name="script_0"/>
+				<radio_item label="Separates Fenster" name="script_1"/>
+			</radio_group>
+			<check_box label="Benachrichtigen, wenn sich die Skriptanzahl in der Region ändert:" name="FSReportTotalScriptCountChanges"/>
+			<spinner name="FSReportTotalScriptCountChangesThreshold" tool_tip="Der Schwellwert, ab dem Änderungen an der Skriptanzahl in der Region gemeldet werden [Standard: 100]"/>
+			<check_box label="Kollisionsmeldungen an Skripte senden. Kanal:" name="FSReportCollisionMessages"/>
+			<spinner name="FSReportCollisionMessagesChannel" tool_tip="Der Kanal, der verwendet wird, um Kollisionsmeldungen an Skripte zu senden [Standard: -25000]"/>
+		</panel>

-    <!-- Inventory -->
-    <panel label="Inventar" name="tab-inventory">
-		<check_box label="Benachrichtigen, wenn ich beim Hochladen Geld bezahlen muss" name="FSShowUploadPaymentToast"/>
-		<check_box label="Benachrichtigen, wenn eine Landmarke erstellt wurde" name="landmark_created_checkbox"/>
-		<check_box label="Objekt-Rückgabe-Benachrichtung deaktivieren" name="FSDisableReturnObjectNotification"/>
-		<check_box label="Dateinamen von gespeicherten Schnappschüssen im Chat in der Nähe protokollieren" name="FSLogSnapshotsToLocal"/>
-		<check_box label="Benachrichtigen, falls Objekte zu schnell eintreffen" name="FSNotifyIncomingObjectSpam"/>
-		<check_box label="Benachrichtigen, falls Objekte von anderen Einwohnern zu schnell eintreffen" name="FSNotifyIncomingObjectSpamFrom"/>
-		<slider name="FSOfferThrottleMaxCount" label="Schwellwert für zu schnell eintreffende Objekte:" label_width="260" width="385" tool_tip="Setzt den Schwellwert für die Anzahl an eintreffenden Objekten innerhalb von 10 Sekunden, ab dem eine Drosselung einsetzt. Standardwert: 5"/>
-    </panel>
+		<!-- Inventory -->
+		<panel label="Inventar" name="tab-inventory">
+			<check_box label="Benachrichtigen, wenn ich beim Hochladen Geld bezahlen muss" name="FSShowUploadPaymentToast"/>
+			<check_box label="Benachrichtigen, wenn eine Landmarke erstellt wurde" name="landmark_created_checkbox"/>
+			<check_box label="Objekt-Rückgabe-Benachrichtung deaktivieren" name="FSDisableReturnObjectNotification"/>
+			<check_box label="Dateinamen von gespeicherten Schnappschüssen im Chat in der Nähe protokollieren" name="FSLogSnapshotsToLocal"/>
+			<check_box label="Benachrichtigen, falls Objekte zu schnell eintreffen" name="FSNotifyIncomingObjectSpam"/>
+			<check_box label="Benachrichtigen, falls Objekte von anderen Einwohnern zu schnell eintreffen" name="FSNotifyIncomingObjectSpamFrom"/>
+			<slider name="FSOfferThrottleMaxCount" label="Schwellwert für zu schnell eintreffende Objekte:" label_width="260" width="385" tool_tip="Setzt den Schwellwert für die Anzahl an eintreffenden Objekten innerhalb von 10 Sekunden, ab dem eine Drosselung einsetzt. Standardwert: 5"/>
+		</panel>

-    <!-- Alerts -->
-    <panel label="Hinweise" name="tab-alerts">
-	<text name="show_label">
-		Immer anzeigen:
-	</text>
-	<text name="dont_show_label">
-		Niemals anzeigen:
-	</text>
-    </panel>
-
-</tab_container>
+		<!-- Alerts -->
+		<panel label="Hinweise" name="tab-alerts">
+			<text name="show_label">
+				Immer anzeigen:
+			</text>
+			<text name="dont_show_label">
+				Niemals anzeigen:
+			</text>
+		</panel>
+	</tab_container>
 </panel>
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@ -90,15 +90,18 @@
             parameter="agent" />
        </menu_item_call>

-        <menu_item_call
+        <menu_item_check
         label="Appearance"
         shortcut="control|O"
         name="ChangeOutfit">
-            <menu_item_call.on_click
+            <menu_item_check.on_click
             function="CustomizeAvatar" />
-            <menu_item_call.on_enable
+            <menu_item_check.on_check
+             function="Floater.IsOpen"
+             parameter="appearance"/>
+            <menu_item_check.on_enable
             function="Edit.EnableCustomizeAvatar" />
-        </menu_item_call>
+        </menu_item_check>

      <menu_item_call
       label="Choose an avatar"
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@ -7915,7 +7915,7 @@ Do you want to keep it? "Mute" will block all future offers or messages from [NA
   log_to_chat="false"
   type="offer"
   sound="UISndTeleportOffer">
-[NAME_SLURL] has offered to teleport you to their location ([POS_SLURL]):
+[NAME_SLURL] has offered to teleport you to their location:

 [MESSAGE]
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
@ -7938,6 +7938,71 @@ Do you want to keep it? "Mute" will block all future offers or messages from [NA
   log_to_im="true"
   log_to_chat="false"
   type="offer">
+[NAME_SLURL] has offered to teleport you to their location:
+
+[MESSAGE]
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+This region contains [REGION_CONTENT_MATURITY] content, but your current preferences are set to exclude [REGION_CONTENT_MATURITY] content.  We can change your preferences and continue with the teleport, or you can cancel this teleport.
+    <tag>confirm</tag>
+    <form name="form">
+      <button
+       index="0"
+       name="Teleport"
+       text="Change and Continue"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="TeleportOffered_MaturityBlocked"
+   log_to_im="true"
+   log_to_chat="false"
+   type="notifytip">
+[NAME_SLURL] has offered to teleport you to their location:
+
+[MESSAGE]
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+However, this region contains content accessible to adults only.
+    <tag>fail</tag>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="TeleportOffered_SLUrl"
+   label="Teleport offer from [NAME_LABEL]"
+   log_to_im="true"
+   log_to_chat="false"
+   type="offer"
+   sound="UISndTeleportOffer">
+[NAME_SLURL] has offered to teleport you to their location ([POS_SLURL]):
+
+[MESSAGE]
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+    <tag>confirm</tag>
+    <form name="form">
+      <button
+       index="0"
+       name="Teleport"
+       text="Teleport"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="TeleportOffered_MaturityExceeded_SLUrl"
+   log_to_im="true"
+   log_to_chat="false"
+   type="offer">
 [NAME_SLURL] has offered to teleport you to their location ([POS_SLURL]):

 [MESSAGE]
@ -7959,7 +8024,7 @@ This region contains [REGION_CONTENT_MATURITY] content, but your current prefere

  <notification
   icon="notify.tga"
-   name="TeleportOffered_MaturityBlocked"
+   name="TeleportOffered_MaturityBlocked_SLUrl"
   log_to_im="true"
   log_to_chat="false"
   type="notifytip">
--- a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
@ -626,6 +626,14 @@
 		 name="FSShowCurrencyBalanceInStatusbar"
 		 width="270"
 		 control_name="FSShowCurrencyBalanceInStatusbar"/>
+		<check_box
+		 top_pad="4"
+		 follows="left|top"
+		 height="16"
+		 label="Enable mouse rollover popup on status bar menu icons"
+		 name="FSStatusBarMenuButtonPopupOnRollover"
+		 width="270"
+		 control_name="FSStatusBarMenuButtonPopupOnRollover"/>

 		<text
 		type="string"
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@ -119,11 +119,22 @@
     name="FSFlashOnMessage"
     top="10"
     width="450"/>
+    <check_box
+     control_name="FSFlashOnObjectIM"
+     enabled_control="FSFlashOnMessage"
+     height="16"
+     label="Also flash the app icon when receiving an instant message from an object"
+     layout="topleft"
+     left="20"
+     name="FSFlashOnObjectIM"
+     top_pad="3"
+     width="450"/>
    <check_box
     control_name="FSShowDisplayNameUpdateNotification"
     height="16"
     label="Notify me when somebody changes their display name"
     layout="topleft"
+     left="10"
     top_pad="3"
     name="FSShowDisplayNameUpdateNotification"
     width="450" />
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@ -9,7 +9,7 @@
 		<menu_item_call label="Destacados" name="Picks"/>
 		<menu_item_call label="Experiencias" name="Experiences"/>
 		<menu_item_call label="Publicar en Facebook" name="PostToFacebook"/>
-		<menu_item_call label="Mi apariencia" name="ChangeOutfit"/>
+		<menu_item_check label="Mi apariencia" name="ChangeOutfit"/>
 		<menu_item_call label="Elige un avatar" name="Avatar Picker"/>
 		<menu_item_call label="Tomar fotografía" name="Take Snapshot"/>
 		<menu_item_check label="Mi inventario" name="Inventory"/>
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@ -3092,7 +3092,7 @@ Por favor, vuelve a intentarlo en unos momentos.
 		</form>
 	</notification>
 	<notification name="TeleportOffered">
-		[NAME_SLURL] te ofrece teleportarte a su localización ([POS_SLURL]):
+		[NAME_SLURL] te ofrece teleportarte a su localización:

 “[MESSAGE]”
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
@ -3102,7 +3102,7 @@ Por favor, vuelve a intentarlo en unos momentos.
 		</form>
 	</notification>
 	<notification name="TeleportOffered_MaturityExceeded">
-		[NAME_SLURL] te ofrece teleportarte a su localización ([POS_SLURL]):
+		[NAME_SLURL] te ofrece teleportarte a su localización:

 “[MESSAGE]”
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
@ -3114,6 +3114,36 @@ Esta región tiene un contenido [REGION_CONTENT_MATURITY, pero tus preferencias
 		</form>
 	</notification>
 	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] te ofrece teleportarte a su localización:
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+No obstante, el contenido de esta región solo es accesible para los adultos.
+	</notification>
+	<notification name="TeleportOffered_SLUrl">
+		[NAME_SLURL] te ofrece teleportarte a su localización ([POS_SLURL]):
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+		<form name="form">
+			<button name="Teleport" text="Teleportarme"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityExceeded_SLUrl">
+		[NAME_SLURL] te ofrece teleportarte a su localización ([POS_SLURL]):
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Esta región tiene un contenido [REGION_CONTENT_MATURITY, pero tus preferencias actuales están configuradas para excluir contenido [REGION_CONTENT_MATURITY]. Podemos cambiar tus preferencias y proceder a teleportarte o bien puedes cancelar el teleporte.
+		<form name="form">
+			<button name="Teleport" text="Cambiar y teleportarme"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked_SLUrl">
 		[NAME_SLURL] te ofrece teleportarte a su localización ([POS_SLURL]):

 “[MESSAGE]”
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@ -9,7 +9,7 @@
 		<menu_item_call label="Favoris" name="Picks"/>
 		<menu_item_call label="Expériences" name="Experiences"/>
 		<menu_item_call label="Profil" name="Profile"/>
-		<menu_item_call label="Apparence" name="ChangeOutfit"/>
+		<menu_item_check label="Apparence" name="ChangeOutfit"/>
 		<menu_item_call label="Sélectionner un avatar" name="Avatar Picker"/>
 		<menu label="Déplacement" name="Movement">
 			<menu_item_call label="S'asseoir" name="Sit Down Here"/>
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@ -2358,8 +2358,8 @@ Souhaitez-vous le garder ? "Ignorer l'expéditeur" ignorera totalement [NAME_SLU
 			<button name="Info" text="Info"/>
 		</form>
 	</notification>
-	<notification name="TeleportOffered" label="Teleport offer from [NAME_LABEL]">
-[NAME_SLURL] vous propose de vous téléporter à son emplacement ([POS_SLURL]):
+	<notification name="TeleportOffered">
+[NAME_SLURL] vous propose de vous téléporter à son emplacement:
 [MESSAGE]
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
 		<form name="form">
@ -2368,7 +2368,7 @@ Souhaitez-vous le garder ? "Ignorer l'expéditeur" ignorera totalement [NAME_SLU
 		</form>
 	</notification>
 	<notification name="TeleportOffered_MaturityExceeded">
-[NAME_SLURL] vous propose de vous téléporter à son emplacement ([POS_SLURL]):
+[NAME_SLURL] vous propose de vous téléporter à son emplacement:
 [MESSAGE]
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
 Cette région contient est de classification [REGION_CONTENT_MATURITY], et vos préférences actuelles sont définies pour exclure le contenu [REGION_CONTENT_MATURITY]. Souhaitez-vous modifier vos préférences et vous téléporter ou annuler cette proposition ?
@ -2378,6 +2378,31 @@ Cette région contient est de classification [REGION_CONTENT_MATURITY], et vos p
 		</form>
 	</notification>
 	<notification name="TeleportOffered_MaturityBlocked">
+[NAME_SLURL] vous propose de vous téléporter à son emplacement:
+[MESSAGE]
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+However, this region contains content accessible to adults only.
+	</notification>
+	<notification name="TeleportOffered_SLUrl">
+[NAME_SLURL] vous propose de vous téléporter à son emplacement ([POS_SLURL]):
+[MESSAGE]
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+		<form name="form">
+			<button name="Teleport" text="Se téléporter"/>
+			<button name="Cancel" text="Annuler"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityExceeded_SLUrl">
+[NAME_SLURL] vous propose de vous téléporter à son emplacement ([POS_SLURL]):
+[MESSAGE]
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+Cette région contient est de classification [REGION_CONTENT_MATURITY], et vos préférences actuelles sont définies pour exclure le contenu [REGION_CONTENT_MATURITY]. Souhaitez-vous modifier vos préférences et vous téléporter ou annuler cette proposition ?
+		<form name="form">
+			<button name="Teleport" text="Modifier et poursuivre"/>
+			<button name="Cancel" text="Annuler"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked_SLUrl">
 [NAME_SLURL] vous propose de vous téléporter à son emplacement ([POS_SLURL]):
 [MESSAGE]
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@ -8,7 +8,7 @@
 		</menu_item_call>
 		<menu_item_call label="Compra L$" name="Buy and Sell L$"/>
 		<menu_item_call label="Il mio profilo" name="Profile"/>
-		<menu_item_call label="Il mio aspetto" name="ChangeOutfit"/>
+		<menu_item_check label="Il mio aspetto" name="ChangeOutfit"/>
 		<menu_item_call label="Scegli un avatar" name="Avatar Picker"/>
 		<menu_item_call label="Esperienze" name="Experiences"/>
 		<menu_item_call label="Foto istantanea" name="Take Snapshot"/>
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@ -2859,7 +2859,7 @@ Riprova tra qualche istante.
 		</form>
 	</notification>
 	<notification name="TeleportOffered">
-		[NAME_SLURL] ti ha offerto il teleport alla sua ubicazione: ([POS_SLURL])
+		[NAME_SLURL] ti ha offerto il teleport alla sua ubicazione:

 “[MESSAGE]”
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
@ -2869,7 +2869,7 @@ Riprova tra qualche istante.
 		</form>
 	</notification>
 	<notification name="TeleportOffered_MaturityExceeded">
-		[NAME_SLURL] ti ha offerto il teleport alla sua ubicazione ([POS_SLURL]):
+		[NAME_SLURL] ti ha offerto il teleport alla sua ubicazione:

 “[MESSAGE]”
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
@ -2881,6 +2881,36 @@ Questa regione include contenuti [REGION_CONTENT_MATURITY], ma le tue preferenze
 		</form>
 	</notification>
 	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] ti ha offerto il teleport alla sua ubicazione:
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Questa regione include però contenuti accessibili solo agli adulti.
+	</notification>
+	<notification name="TeleportOffered_SLUrl">
+		[NAME_SLURL] ti ha offerto il teleport alla sua ubicazione: ([POS_SLURL])
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+		<form name="form">
+			<button name="Teleport" text="Teleport"/>
+			<button name="Cancel" text="Cancella"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityExceeded_SLUrl">
+		[NAME_SLURL] ti ha offerto il teleport alla sua ubicazione ([POS_SLURL]):
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Questa regione include contenuti [REGION_CONTENT_MATURITY], ma le tue preferenze attuali escludono i contenuti  [REGION_CONTENT_MATURITY].  Puoi modificare le preferenze e continuare con il teleport oppure annullarlo.
+		<form name="form">
+			<button name="Teleport" text="Modifica e continua"/>
+			<button name="Cancel" text="Annulla"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked_SLUrl">
 		[NAME_SLURL] ti ha offerto il teleport alla sua ubicazione ([POS_SLURL]):

 “[MESSAGE]”
--- a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
@ -3,13 +3,20 @@
 <context_menu name="Avatar Pie">
 	<menu_item_call label="プロフィールの表示" name="Profile..."/>
 	<menu_item_call label="フレンド登録" name="Add Friend"/>
+	<menu_item_call label="連絡先セット追加" name="Add to Set" />
 	<menu_item_call label="IM" name="Send IM..."/>
+	<menu_item_call label="コーリングカードを送る" name="Give Calling Card" />
 	<menu_item_call label="コール" name="Call"/>
 	<menu_item_call label="グループに招待" name="Invite..."/>
-	<menu_item_call label="ブロック" name="Avatar Mute"/>
-	<menu_item_call label="報告" name="abuse"/>
-	<menu_item_call label="フリーズ" name="Freeze..."/>
-	<menu_item_call label="追放" name="Eject..."/>
+	<menu_item_separator />
+	<context_menu label="迷惑行為対応" name="Annoyance">
+		<menu_item_call label="ブロック" name="Avatar Mute" />
+		<!-- <FS:Zi> Add unblock menu entry since renaming the context menu item doesn't seem to work -->
+		<menu_item_call label="ブロック解除" name="Avatar Unmute" />
+		<menu_item_call label="報告" name="abuse"/>
+		<menu_item_call label="フリーズ" name="Freeze..."/>
+		<menu_item_call label="追放" name="Eject..."/>
+	</context_menu>
 	<menu_item_call label="テクスチャのデバッグ" name="Debug..."/>
 	<menu_item_call label="ダンプ XML" name="Dump XML"/>
 	<menu_item_call label="ズームイン" name="Zoom In"/>
--- a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
@ -3,13 +3,20 @@
 <context_menu name="Avatar Pie">
 	<menu_item_call label="プロフィールの表示" name="Profile..."/>
 	<menu_item_call label="フレンド登録" name="Add Friend"/>
+	<menu_item_call label="コーリングカードを送る" name="Give Calling Card" />
+	<menu_item_call label="連絡先セット追加" name="Add to Set" />
 	<menu_item_call label="IM" name="Send IM..."/>
 	<menu_item_call label="コール" name="Call"/>
 	<menu_item_call label="グループに招待" name="Invite..."/>
-	<menu_item_call label="ブロック" name="Avatar Mute"/>
-	<menu_item_call label="報告" name="abuse"/>
-	<menu_item_call label="フリーズ" name="Freeze..."/>
-	<menu_item_call label="追放" name="Eject..."/>
+	<context_menu label="迷惑行為対応" name="Remove">
+		<menu_item_call label="ブロック" name="Avatar Mute" />
+		<!-- <FS:Zi> Add unblock menu entry since renaming the context menu item doesn't seem to work -->
+		<menu_item_call label="ブロック解除" name="Avatar Unmute" />
+		<!-- </FS:Zi> -->
+		<menu_item_call label="報告" name="abuse"/>
+		<menu_item_call label="フリーズ" name="Freeze..."/>
+		<menu_item_call label="追放" name="Eject..."/>
+	</context_menu>
 	<menu_item_call label="テクスチャのデバッグ" name="Debug..."/>
 	<menu_item_call label="ダンプ XML" name="Dump XML"/>
 	<menu_item_call label="ズームイン" name="Zoom In"/>
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@ -16,7 +16,7 @@
 		<menu_item_call label="体験..." name="Experiences"/>
 		
 		<menu_item_call label="プロフィール" name="Profile"/>
-		<menu_item_call label="容姿" name="ChangeOutfit"/>
+		<menu_item_check label="容姿" name="ChangeOutfit"/>
 		<menu_item_call label="アバターを選択..." name="Avatar Picker"/>
 		
 		<menu label="ムーブメント" name="Movement">
@ -40,7 +40,7 @@
 			<menu_item_call label="テクスチャのリベークをする" name="Rebake Texture"/>
 			<menu_item_call label="アバターを男性のデフォルトにリセット" name="ResetDefaultAvM"/>
 			<menu_item_call label="アバターを女性のデフォルトにリセット" name="ResetDefaultAvF"/>
-			<menu_item_check label="アバターのレンダリング量を表示" name="Avatar Rendering Cost"/>
+			<menu_item_check label="アバター表示の複雑さ情報を表示" name="Avatar Draw Info" />
 			<menu_item_call label="ラグメーター" name="Lag Meter" />
 			<menu_item_call label="ブリッジを再作成" name="Recreate LSL Bridge"/>
 		</menu>
@ -358,7 +358,7 @@
 			<menu_item_call label="ラグメーター" name="Lag Meter" />
 			<menu_item_check label="統計バー" name="Statistics Bar"/>
 			<menu_item_check label="シーン読込みの統計" name="Scene Load Statistics" />
-			<menu_item_check label="アバターのレンダリングコストを表示する" name="Avatar Rendering Cost"/>
+			<menu_item_check label="アバター表示の複雑さ情報を表示" name="Avatar Draw Info" />
 		</menu>
 		<menu label="ハイライトと目に見えるもの" name="Highlighting and Visibility">
 			<menu_item_check label="チージービーコン" name="Cheesy Beacon"/>
@ -515,8 +515,6 @@
 			<menu_item_check label="ジョイント" name="Joints" />
 			<menu_item_check label="レイキャスト" name="Raycast"/>
 			<menu_item_check label="風ベクトル" name="Wind Vectors"/>
-			<menu_item_check label="複雑なものをレンダリング" name="rendercomplexity"/>
-			<menu_item_check label="装着物のバイト数" name="attachment bytes"/>
 			<menu_item_check label="スカルプト" name="Sculpt"/>
 			<menu_item_check label="テクスチャのサイズ" name="Texture Size" />
 			<menu label="テクスチャの密度" name="Texture Density">
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@ -1415,6 +1415,15 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries を参照してく
 			<ignore name="ignore" text="衣類がダウンロードされるまで時間がかかっているとき"/>
 		</form>
 	</notification>
+	<notification name = "AgentComplexityWithVisibility">
+ご使用の [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 表示の複雑さ] は [AGENT_COMPLEXITY] です。
+[OVERLIMIT_MSG]
+		<usetemplate ignoretext="自分のアバター表示の複雑さが極めて高い時に警告する" name="notifyignore"/>
+	</notification>
+
+	<notification name = "AgentComplexity">
+ご使用の [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 表示の複雑さ] は [AGENT_COMPLEXITY] です。
+	</notification>
 	<notification name="FirstRun">
 		[APP_NAME] のインストールが完了しました。

@ -1779,14 +1788,7 @@ http://secondlife.com/download から最新バージョンをダウンロード
 		グループを抜けることができません。グループの最後のオーナーであるため、グループを抜けることができません。最初に、別のメンバーをオーナーの役割に割り当ててください。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="GroupDepartError">
-		グループを抜けることができません: [reason]。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="GroupDepart">
-		グループ [group_name] を抜けました。
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
+	
 	<notification name="ConfirmKick">
 		本当に住人全員をグリッドから追い出しますか？
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="住人全員を追い出す"/>
@ -2492,6 +2494,12 @@ Linden Lab
 		ごみ箱の中身をすべて削除しますか？
 		<usetemplate ignoretext="インベントリのごみ箱フォルダを空にする前の確認" name="okcancelignore" notext="キャンセル" yestext="OK"/>
 	</notification>
+	
+	<notification name="TrashIsFull">
+ゴミ箱が一杯です。ログイン時に問題が起こる可能性があります。
+		<usetemplate name="okcancelbuttons" notext="あとでゴミ箱を空にする" yestext="今すぐゴミ箱を空にする"/>
+	</notification>
+	
 	<notification name="ConfirmClearBrowserCache">
 		トラベル、Web、検索の履歴をすべて削除しますか？
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
@ -3124,7 +3132,7 @@ URL: [MOAPURL]
 		</form>
 	</notification>
 	<notification name="TeleportOffered">
-		[NAME_SLURL] はテレポートであなたを呼んでいます （[POS_SLURL]）。
+		[NAME_SLURL] はテレポートであなたを呼んでいます。

 “[MESSAGE]”
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
@ -3134,7 +3142,7 @@ URL: [MOAPURL]
 		</form>
 	</notification>
 	<notification name="TeleportOffered_MaturityExceeded">
-		[NAME_SLURL] はテレポートであなたを呼んでいます （[POS_SLURL]）。
+		[NAME_SLURL] はテレポートであなたを呼んでいます。

 “[MESSAGE]”
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
@ -3146,6 +3154,36 @@ URL: [MOAPURL]
 		</form>
 	</notification>
 	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] はテレポートであなたを呼んでいます。
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+ただし、この地域（リージョン）には成人のみアクセスできるコンテンツが含まれています。
+	</notification>
+	<notification name="TeleportOffered_SLUrl">
+		[NAME_SLURL] はテレポートであなたを呼んでいます （[POS_SLURL]）。
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+		<form name="form">
+			<button name="Teleport" text="テレポート"/>
+			<button name="Cancel" text="取り消し"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityExceeded_SLUrl">
+		[NAME_SLURL] はテレポートであなたを呼んでいます （[POS_SLURL]）。
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+この地域（リージョン）には [REGION_CONTENT_MATURITY] コンテンツが含まれていますが、現在の環境設定は [REGION_CONTENT_MATURITY] コンテンツを除外するように設定されています。環境設定を変更してテレポートを続けるか、このテレポートを取り消すことができます。
+		<form name="form">
+			<button name="Teleport" text="変更して続ける"/>
+			<button name="Cancel" text="取り消し"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked_SLUrl">
 		[NAME_SLURL] はテレポートであなたを呼んでいます （[POS_SLURL]）。

 “[MESSAGE]”
@ -3502,6 +3540,15 @@ M キーを押して変更します。
 	<notification name="AppearanceToXMLFailed">
 		容姿のXMLファイルへの保存が失敗しました
 	</notification>
+	
+	<notification name="PresetNotSaved">
+事前設定 [NAME] の保存時にエラーが発生しました。
+	</notification>
+
+	<notification name="PresetNotDeleted">
+事前設定 [NAME] の削除時にエラーが発生しました。
+	</notification>
+  
 	<notification name="UnableToFindHelpTopic">
 		ヘルプトピックが見つかりませんでした。
 	</notification>
--- a/indra/newview/skins/default/xui/ja/panel_fs_nui_login.xml
+++ b/indra/newview/skins/default/xui/ja/panel_fs_nui_login.xml
@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_login">
+	<panel.string name="forgot_password_url">
+		http://secondlife.com/account/request.php?lang=ja
+	</panel.string>
+	<layout_stack name="ui_stack">
+		<layout_panel name="ui_elastic_pad_left" />
+		<layout_panel name="ui_container">
+			<icon name="sl_logo_small" />
+			<layout_stack name="vert_stack_left">
+				<layout_panel name="1st_row">
+					<layout_stack name="1st_row_stack">
+						<layout_panel name="login">
+							<combo_box label="ユーザーネーム" tool_tip="登録時に自分で選んだユーザー名（例：bobsmith12、Steller Sunshineなど）" name="username_combo" />
+							<check_box label="ユーザーネームを記憶" name="remember_username_check" />
+						</layout_panel> <!-- login -->
+						<layout_panel name="delete_container">
+							<button tool_tip="このユーザーネームを消去" label="" name="remove_user_btn" />
+						</layout_panel> <!-- delete_container -->
+						<layout_panel name="password_container">
+							<!-- The max length might be changed in FSPanelLogin.cpp for Opensim! -->
+							<line_editor name="password_edit" label="パスワード" />
+							<check_box label="パスワードを記憶" name="remember_check" />
+						</layout_panel> <!-- password_container -->
+						<layout_panel name="start_location_panel">
+							<combo_box label="開始地点" name="start_location_combo">
+								<combo_box.item label="最後にログアウトした場所" name="MyLastLocation" />
+								<combo_box.item label="ホーム" name="MyHome" />
+								<combo_box.item label="＜地域名を入力＞" name="Typeregionname" />
+							</combo_box>
+						</layout_panel> <!-- start_location_panel -->
+					</layout_stack> <!-- 1st_row_stack -->
+				</layout_panel> <!-- 1st_row -->
+
+				<layout_panel name="2nd_row">
+					<layout_stack name="2nd_row_stack">
+						<layout_panel name="grid_panel">
+							<text name="grid_login_text" width="95">
+								グリッド選択:
+							</text>
+							<combo_box name="server_combo" />
+
+						</layout_panel>
+
+						<layout_panel name="mode_selection">
+							<text name="mode_selection_text">
+								モード選択:
+							</text>
+							<combo_box tool_tip="基本設定を適切に行うために、一番慣れているビューワのタイプを選択して下さい。" name="mode_combo">
+								<combo_box.item label="Firestorm" name="Firestorm" />
+								<combo_box.item label="Phoenix" name="Phoenix" />
+								<combo_box.item label="Viewer 3" name="V3" />
+								<combo_box.item label="ハイブリッド" name="Hybrid" />
+								<combo_box.item label="Latency" name="Latency" />
+								<combo_box.item label="テキスト" name="Text" />
+							</combo_box>
+						</layout_panel>
+
+					</layout_stack> <!-- 2nd_row_stack -->
+				</layout_panel>  <!-- 2nd_row -->
+			</layout_stack> <!-- vert_stack -->
+			<button label="ログイン" name="connect_btn" />
+			<text name="create_new_account_text">
+				アカウント作成
+			</text>
+			<text name="forgot_password_text">
+				パスワードをお忘れ？
+			</text>
+		</layout_panel>
+		<layout_panel name="ui_elastic_pad_right" />
+	</layout_stack>
+</panel>
--- a/indra/newview/skins/default/xui/ja/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_UI.xml
@ -72,6 +72,8 @@
 		<slider label="スクリプトダイアログ当たりの表示行数：" name="FSRowsPerScriptDialog" tool_tip="同時に見ることのできるスクリプトダイアログの最大行数" />

 		<check_box label="パイメニューを使用" name="UsePieMenu" tool_tip="土地や中バー、オブジェクト、装着物を右クリックした時に、諜報兼のコンテキストメニューでなく、１系の丸いメニューを使用します。" />
+		<check_box label="テキストに動きを付ける" name="PieMenuPopupFontEffect" tool_tip="パイメニューが開く時のアニメーションに合わせて、パイメニューの中のテキストも動くようにします。" />
+		<check_box label="外側に丸い影を付ける" name="PieMenuOuterRingShade" tool_tip="パイメニューの縁に丸い影をつけてサブメニューを見やすくします。" />
        <check_box label="グループ通知や支払い通知を右上に表示" name="ShowGroupNoticesTopRight" tool_tip="ここにチェックを入れると、グループ通知や支払い通知などを画面の右上に表示します。（旧式の１系スタイル）" />
        <text name="GroupTopRightRequiresRestart">
            （再起動が必要）
@ -103,6 +105,7 @@
 		<check_box label="トップメニューに現在の場所を表示" name="ShowMenuBarLocation" />
 		<check_box label="メニュー検索を表示" name="show_search_menu_check"/>
 		<check_box label="リンデンドルの残高を表示" name="FSShowCurrencyBalanceInStatusbar" />
+		<check_box label="ステータスバーのメニューアイコンにマウスをロールオーバーでポップアップを表示" name="FSStatusBarMenuButtonPopupOnRollover" />
 		
 		<text name="navfav_textbox">
 			ナビゲーション＆お気に入りバー：
--- a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
@ -23,6 +23,7 @@

 	<panel label="人" name="tab-people">
 		<check_box label="メッセージを受信した時 [APP_NAME] が前面になっていなければ、アプリのアイコンを点滅させる" name="FSFlashOnMessage" />
+		<check_box label="オブジェクトからのIMの場合も受信した時にアプリのアイコンを点滅させる" name="FSFlashOnObjectIM" />
 		<check_box label="誰かが表示名を変更したら通知" name="FSShowDisplayNameUpdateNotification" />
 		<check_box label="誰かをブロックまたはブロック解除したら通知" name="FSReportBlockToNearbyChat" />
 		<text name="friends_logon_label">
--- a/indra/newview/skins/default/xui/ja/panel_preferences_backup.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_backup.xml
@ -88,6 +88,12 @@
 						<row name="restore_per_account_row_groupmutes">
 							<column name="restore_per_account_files_label">抑止したグループチャット</column>
 						</row>
+						<row name="restore_per_account_row_presets">
+							<column name="restore_per_account_files_label">事前設定</column>
+						</row>
+						<row name="restore_per_account_row_avatar_render_settings">
+							<column name="restore_per_account_files_label">アバター表示設定</column>
+						</row>
 					</scroll_list>
 				</layout_panel>

--- a/indra/newview/skins/default/xui/ja/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_firestorm.xml
@ -101,6 +101,8 @@
        <text name="note_lookat" >
             （アバターの視線に関する設定は「プライバシー」タブにあります。）
        </text>
+        
+        <check_box label="アバターのランダムな目の動きを抑止する" name="FSStaticEyes" />

        <!-- LGGカラービーム -->
 		
@ -271,6 +273,8 @@
    <panel label="制作2" name="BuildTab2">

 		<check_box label="選択したプリムを強調表示" tool_tip="このチェックを外した場合、黄色や青のプリムの輪郭が表示されなくなります。これにより、選択しているプリム数が多い場合に処理性能を向上させることができます。" name="FSBuildPrefsRenderHighlight_toggle"/>
+		<check_box label="選択している土地の境界をハイライトする" name="RenderParcelSelection" />
+		<check_box label="土地の境界を制作できる最大の高さまで表示する" name="FSRenderParcelSelectionToMaxBuildHeight" />
 		<check_box label="遠くのオブジェクトを選択しない" name="LimitSelectDistance"/>
 		<check_box label="ドラッグできる距離を制限 (m):" name="LimitDragDistance" />
 		<spinner name="MaxDragDistance" tool_tip="移動ツールの一回の操作で移動できる最大の距離を設定します。(開始位置からメートル単位で設定) [Default: 48.000]" />
--- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@ -63,9 +63,9 @@
 	<check_box label="古い形式の名前の時「Resident」を省略しない" name="legacy_trim_check" tool_tip="古い形式の名前の時「Resident」を省略しないようにします。" />
 	<check_box label="古い形式の名前タグ位置" name="FSLegacyNametagPosition" tool_tip="ここにチェックを入れると、アニメーションでアバターの見かけの位置が動いた時、名前タグはアバターの頭の位置を追いかけることなく、アバターが立っている本来の位置に留まり続けます。" />
 	
-	<!--
-	<check_box label="ビューワの UI ヒントを有効にする" name="viewer_hints_check"/>
-	-->
+	<check_box label="アバター表示の複雑さを表示" name="FSTagShowARW" tool_tip="ここにチェックを入れると、ネームタグに現在のアバター表示の複雑さが表示されます。"/>
+	<check_box label="極めて複雑な場合のみ" name="FSTagShowTooComplexOnlyARW" tool_tip="ここにチェックを入れると、アバターが極めて複雑でゼリー人形のように見える場合にのみネームタグにそのアバターの複雑さを表示します。"/>
+	<check_box label="自分のアバターの複雑さのみ" name="FSTagShowOwnARW" tool_tip="ここにチェックを入れると、ネームタグにあなた自身の現在のアバターの複雑さが表示されます。"/>
 	
 	<check_box label="名前タグに自動応答モードを表示" name="FSShowAutorespondInNameTag" tool_tip="ここにチェックを入れると、自分の名前タグに自動応答モードをオンにしているかどうかが表示されます。" />
 	
--- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@ -6,7 +6,14 @@
 	<!-- 一般 -->
 	
 	<panel label="一般" name="General">
-	
+		<text name="preset_label" width="90">
+			使用中の事前設定:
+		</text>
+
+		<text name="preset_text">
+			（なし）
+		</text>
+		
 		<text name="QualitySpeed">
 			クォリティとスピード:
 		</text>
@ -82,7 +89,14 @@
 			m
 		</text>
 		<slider label="最大パーティクル数：" name="MaxParticleCount"/>
-		<slider label="簡略化せずに描画するアバターの最大数：" name="MaxNumberAvatarDrawn"/>
+		<slider tool_tip="表示の複雑なアバターをゼリー人形のように表示し始める値を設定します。" label="複雑さの最大値" name="IndirectMaxComplexity" />
+		<text name="IndirectMaxComplexityText">
+			0
+		</text>
+		<slider label="簡略化せずに描画するアバターの最大数" name="IndirectMaxNonImpostors" />
+		<text name="IndirectMaxNonImpostorsText">
+			0
+		</text>
 		<slider label="ポストプロセス品質：" name="RenderPostProcess"/>
 		<text name="PostProcessText">
 			低
@ -103,7 +117,6 @@
 		<text name="AvatarRenderingText">
 			アバターレンダリング：
 		</text>
-		<check_box label="アバターの描画を簡略化" name="AvatarImpostors"/>
 		<check_box label="ハードウェアスキニング" name="AvatarVertexProgram"/>
 		<check_box label="アバターの布" name="AvatarCloth"/>
 		<text name="TerrainDetailText">
@ -114,6 +127,13 @@
 			<radio_item label="高" name="2"/>
 		</radio_group>
 		
+		<text name="Presets_Label">
+			事前設定:
+		</text>
+		<button label="保存" name="PrefSaveButton" />
+		<button label="読み込み" name="PrefLoadButton" />
+		<button label="削除" name="PrefDeleteButton" />
+
 		<button label="リセット" name="Defaults"/>
 	
 	</panel>
@ -228,5 +248,6 @@
    </panel>
 	
 </tab_container>
+
 </panel>

--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@ -9,7 +9,7 @@
 		<menu_item_call label="Miejsca" name="Picks"/>
 		<menu_item_call label="Przygody" name="Experiences"/>
 		<menu_item_call label="Mój Profil" name="Profile"/>
-		<menu_item_call label="Mój wygląd" name="ChangeOutfit"/>
+		<menu_item_check label="Mój wygląd" name="ChangeOutfit"/>
 		<menu_item_call label="Biblioteka awatarów" name="Avatar Picker"/>
 		<menu label="Ruch" name="Movement">
 			<menu_item_call label="Usiądź" name="Sit Down Here"/>
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@ -2932,7 +2932,7 @@ Chcesz zachować ten obiekt? Wybranie "Zablokuj" sprawi, że nie będziesz już
 		</form>
 	</notification>
 	<notification name="TeleportOffered" label="Propozycja teleportacji od [NAME_LABEL]">
-		[NAME_SLURL] proponuje Ci teleportację do siebie ([POS_SLURL]):
+		[NAME_SLURL] proponuje Ci teleportację do siebie:

 [MESSAGE]
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
@ -2942,7 +2942,7 @@ Chcesz zachować ten obiekt? Wybranie "Zablokuj" sprawi, że nie będziesz już
 		</form>
 	</notification>
 	<notification name="TeleportOffered_MaturityExceeded">
-		[NAME_SLURL] proponuje Ci teleportację do siebie ([POS_SLURL]):
+		[NAME_SLURL] proponuje Ci teleportację do siebie:

 [MESSAGE]
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
@ -2954,6 +2954,36 @@ Ten region zawiera treści [REGION_CONTENT_MATURITY], ale Twoje obecne preferenc
 		</form>
 	</notification>
 	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] zaproponował/a Ci teleportację do siebie:
+
+[MESSAGE]
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Ten region zawiera jednak treści tylko dla dorosłych.
+	</notification>
+	<notification name="TeleportOffered_SLUrl" label="Propozycja teleportacji od [NAME_LABEL]">
+		[NAME_SLURL] proponuje Ci teleportację do siebie ([POS_SLURL]):
+
+[MESSAGE]
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+		<form name="form">
+			<button name="Teleport" text="Teleportuj"/>
+			<button name="Cancel" text="Anuluj"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityExceeded_SLUrl">
+		[NAME_SLURL] proponuje Ci teleportację do siebie ([POS_SLURL]):
+
+[MESSAGE]
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Ten region zawiera treści [REGION_CONTENT_MATURITY], ale Twoje obecne preferencje są tak ustawione, aby odrzucać treści [REGION_CONTENT_MATURITY]. Możesz zmienić swoje preferencje i kontynuować teleport albo anulować go.
+		<form name="form">
+			<button name="Teleport" text="Zmień i teleportuj"/>
+			<button name="Cancel" text="Anuluj"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked_SLUrl">
 		[NAME_SLURL] zaproponował/a Ci teleportację do siebie ([POS_SLURL]):

 [MESSAGE]
--- a/indra/newview/skins/default/xui/pl/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_UI.xml
@ -84,6 +84,7 @@
        <check_box label="Pokaż lokalizację w menu na górze" name="ShowMenuBarLocation" />
        <check_box label="Pokaż wyszukiwarkę pozycji w menu" name="show_search_menu_check" />
        <check_box label="Pokaż stan konta" name="FSShowCurrencyBalanceInStatusbar" />
+        <check_box label="Włącz autorozwijanie menusów przy wskazywaniu ikon na pasku" name="FSStatusBarMenuButtonPopupOnRollover" />
        <text name="navfav_textbox">
            Paski nawigacji i ulubionych:
        </text>
--- a/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml
@ -12,6 +12,7 @@
 	</panel>
 	<panel label="Ludzie" name="tab-people">
 		<check_box label="Mrugaj ikoną aplikacji, gdy nadchodzi wiadomość, a [APP_NAME] jest w tle" name="FSFlashOnMessage"/>
+		<check_box label="Mrugaj ikoną aplikacji także podczas otrzymywania wiadomości IM od obiektów" name="FSFlashOnObjectIM"/>
 		<check_box label="Powiadom, gdy ktoś zmieni Wyświetlane Imię" name="FSShowDisplayNameUpdateNotification"/>
 		<check_box label="Powiadom, gdy kogoś zablokuję lub odblokuję" name="FSReportBlockToNearbyChat"/>
 		<text name="friends_logon_label">
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@ -7,7 +7,7 @@
 		</menu_item_call>
 		<menu_item_call label="Comprar L$" name="Buy and Sell L$"/>
 		<menu_item_call label="Meu perfil" name="Profile"/>
-		<menu_item_call label="Minha aparência" name="ChangeOutfit"/>
+		<menu_item_check label="Minha aparência" name="ChangeOutfit"/>
 		<menu_item_call label="Selecione um avatar" name="Avatar Picker"/>
 		<menu_item_check label="Meu inventário" name="Inventory"/>
 		<menu_item_call label="Experiências" name="Experiences"/>
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@ -2843,7 +2843,7 @@ Por favor, tente novamente em alguns instantes.
 		</form>
 	</notification>
 	<notification name="TeleportOffered">
-		[NAME_SLURL] quer teletransportar você para a região deles ([POS_SLURL]):
+		[NAME_SLURL] quer teletransportar você para a região deles:

 “[MESSAGE]”
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
@ -2853,7 +2853,7 @@ Por favor, tente novamente em alguns instantes.
 		</form>
 	</notification>
 	<notification name="TeleportOffered_MaturityExceeded">
-		[NAME_SLURL] quer teletransportar você para a região deles ([POS_SLURL]):
+		[NAME_SLURL] quer teletransportar você para a região deles:

 “[MESSAGE]”
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
@ -2865,6 +2865,36 @@ A região tem conteúdo [REGION_CONTENT_MATURITY], mas suas preferências atuais
 		</form>
 	</notification>
 	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] quer teletransportar você para a região deles:
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+No entanto, esta região tem conteúdo acessível apenas para adultos.
+	</notification>
+	<notification name="TeleportOffered_SLUrl">
+		[NAME_SLURL] quer teletransportar você para a região deles ([POS_SLURL]):
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+		<form name="form">
+			<button name="Teleport" text="Teletransporte"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityExceeded_SLUrl">
+		[NAME_SLURL] quer teletransportar você para a região deles ([POS_SLURL]):
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+A região tem conteúdo [REGION_CONTENT_MATURITY], mas suas preferências atuais estão definidas para excluir conteúdo [REGION_CONTENT_MATURITY].  Podemos alterar suas preferências e continuar o teletransporte, ou você pode cancelar este teletransporte.
+		<form name="form">
+			<button name="Teleport" text="Alterar e continuar"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked_SLUrl">
 		[NAME_SLURL] quer teletransportar você para a região deles ([POS_SLURL]):

 “[MESSAGE]”
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@ -8,7 +8,7 @@
 		<menu_item_call label="Кнопки панели инструментов" name="Toolbar Buttons"/>
 		<menu_item_call label="Профиль" name="Profile"/>
 		<menu_item_call label="Места" name="Picks"/>
-		<menu_item_call label="Внешность" name="ChangeOutfit"/>
+		<menu_item_check label="Внешность" name="ChangeOutfit"/>
 		<menu_item_call label="Выберите аватар" name="Avatar Picker"/>
 		<menu_item_call label="Приключения" name="Experiences"/>
 		<menu_item_call label="Снимок" name="Take Snapshot"/>
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@ -3071,7 +3071,7 @@ URL: [MEDIAURL]
 		</form>
 	</notification>
 	<notification name="TeleportOffered">
-		[NAME_SLURL] предложил(а) телепортировать вас к себе ([POS_SLURL]):
+		[NAME_SLURL] предложил(а) телепортировать вас к себе:

 &quot;[MESSAGE]&quot;
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
@ -3081,7 +3081,7 @@ URL: [MEDIAURL]
 		</form>
 	</notification>
 	<notification name="TeleportOffered_MaturityExceeded">
-		[NAME_SLURL] предложил(а) телепортировать вас к себе ([POS_SLURL]):
+		[NAME_SLURL] предложил(а) телепортировать вас к себе:

 &quot;[MESSAGE]&quot;
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
@ -3093,6 +3093,36 @@ URL: [MEDIAURL]
 		</form>
 	</notification>
 	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] предложил(а) телепортировать вас к себе:
+
+&quot;[MESSAGE]&quot;
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Однако этот регион содержит контент, доступный только для взрослых.
+	</notification>
+	<notification name="TeleportOffered_SLUrl">
+		[NAME_SLURL] предложил(а) телепортировать вас к себе ([POS_SLURL]):
+
+&quot;[MESSAGE]&quot;
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+		<form name="form">
+			<button name="Teleport" text="Телепортация"/>
+			<button name="Cancel" text="Отмена"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityExceeded_SLUrl">
+		[NAME_SLURL] предложил(а) телепортировать вас к себе ([POS_SLURL]):
+
+&quot;[MESSAGE]&quot;
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Этот регион содержит контент с рейтингом [REGION_CONTENT_MATURITY], но ваши настройки не допускают контента [REGION_CONTENT_MATURITY].  Вы можете отказаться от телепортации, или ваши настройки будут изменены.
+		<form name="form">
+			<button name="Teleport" text="Изменить и продолжить"/>
+			<button name="Cancel" text="Отмена"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked_SLUrl">
 		[NAME_SLURL] предложил(а) телепортировать вас к себе ([POS_SLURL]):

 &quot;[MESSAGE]&quot;
--- a/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml
@ -2,7 +2,7 @@
 <menu_bar name="Main Menu">
 	<menu label="Ben" name="Me">
 		<menu_item_call label="Profil..." name="Profile"/>
-		<menu_item_call label="Görünüm..." name="ChangeOutfit"/>
+		<menu_item_check label="Görünüm..." name="ChangeOutfit"/>
 		<menu_item_call label="Bir avatar seçin..." name="Avatar Picker"/>
 		<menu_item_check label="Envanter..." name="Inventory"/>
 		<menu_item_call label="Yeni Envanter Penceresi" name="NewInventoryWindow"/>
--- a/indra/newview/skins/default/xui/tr/notifications.xml
+++ b/indra/newview/skins/default/xui/tr/notifications.xml
@ -2907,7 +2907,7 @@ Lütfen biraz sonra tekrar deneyin.
 		</form>
 	</notification>
 	<notification name="TeleportOffered">
-		[NAME_SLURL] size kendi konumuna ışınlanmayı teklif etti ([POS_SLURL]):
+		[NAME_SLURL] size kendi konumuna ışınlanmayı teklif etti:

 “[MESSAGE]”
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
@ -2917,7 +2917,7 @@ Lütfen biraz sonra tekrar deneyin.
 		</form>
 	</notification>
 	<notification name="TeleportOffered_MaturityExceeded">
-		[NAME_SLURL] size kendi konumuna ışınlanmayı teklif etti ([POS_SLURL]):
+		[NAME_SLURL] size kendi konumuna ışınlanmayı teklif etti:

 “[MESSAGE]”
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
@ -2929,6 +2929,36 @@ Bu bölgede [REGION_CONTENT_MATURITY] içeriği mevcut, ama mevcut tercihleriniz
 		</form>
 	</notification>
 	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] size kendi konumuna ışınlanmayı teklif etti:
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Ancak bu bölge sadece yetişkinlerin erişebileceği içeriğe sahip.
+	</notification>
+	<notification name="TeleportOffered_SLUrl">
+		[NAME_SLURL] size kendi konumuna ışınlanmayı teklif etti ([POS_SLURL]):
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+		<form name="form">
+			<button name="Teleport" text="Işınla"/>
+			<button name="Cancel" text="İptal"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityExceeded_SLUrl">
+		[NAME_SLURL] size kendi konumuna ışınlanmayı teklif etti ([POS_SLURL]):
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Bu bölgede [REGION_CONTENT_MATURITY] içeriği mevcut, ama mevcut tercihleriniz [REGION_CONTENT_MATURITY] içeriğini dışlayacak şekilde ayarlanmış durumda.  Tercihlerinizi değiştirebilirsiniz ve ışınlamaya devam edebilirsiniz veya bu ışınlama işlemini iptal edebilirsiniz.
+		<form name="form">
+			<button name="Teleport" text="Değiştir ve Devam Et"/>
+			<button name="Cancel" text="İptal"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked_SLUrl">
 		[NAME_SLURL] size kendi konumuna ışınlanmayı teklif etti ([POS_SLURL]):

 “[MESSAGE]”
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@ -2,7 +2,7 @@
 <menu_bar name="Main Menu">
 	<menu label="我自己" name="Me">
 		<menu_item_call label="檔案..." name="Profile"/>
-		<menu_item_call label="外觀…" name="ChangeOutfit"/>
+		<menu_item_check label="外觀…" name="ChangeOutfit"/>
 		<menu_item_call label="選擇一個化身…" name="Avatar Picker"/>
 		<menu_item_check label="收納區…" name="Inventory"/>
 		<menu_item_call label="新收納區視窗" name="NewInventoryWindow"/>
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@ -2843,7 +2843,7 @@ SHA1 指紋：[MD5_DIGEST]
 		</form>
 	</notification>
 	<notification name="TeleportOffered">
-		[NAME_SLURL] 想要瞬間傳送你到他的地點 （[POS_SLURL]）：
+		[NAME_SLURL] 想要瞬間傳送你到他的地點：

 “[MESSAGE]”
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
@ -2853,7 +2853,7 @@ SHA1 指紋：[MD5_DIGEST]
 		</form>
 	</notification>
 	<notification name="TeleportOffered_MaturityExceeded">
-		[NAME_SLURL] 想要瞬間傳送你到他的地點 （[POS_SLURL]）：
+		[NAME_SLURL] 想要瞬間傳送你到他的地點：

 “[MESSAGE]”
 &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
@ -2865,6 +2865,36 @@ SHA1 指紋：[MD5_DIGEST]
 		</form>
 	</notification>
 	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] 想要瞬間傳送你到他的地點：
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+可是，此地區含有僅限成人的內容。
+	</notification>
+	<notification name="TeleportOffered_SLUrl">
+		[NAME_SLURL] 想要瞬間傳送你到他的地點 （[POS_SLURL]）：
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+		<form name="form">
+			<button name="Teleport" text="瞬間傳送"/>
+			<button name="Cancel" text="取消"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityExceeded_SLUrl">
+		[NAME_SLURL] 想要瞬間傳送你到他的地點 （[POS_SLURL]）：
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+此地區包含 [REGION_CONTENT_MATURITY] 的分級內容，可是你目前的偏好設定排除了 [REGION_CONTENT_MATURITY] 的分級內容。  我們可以變更你的偏好設定好讓你繼續瞬間傳送，你也可取消這動作。
+		<form name="form">
+			<button name="Teleport" text="變更後繼續"/>
+			<button name="Cancel" text="取消"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked_SLUrl">
 		[NAME_SLURL] 想要瞬間傳送你到他的地點 （[POS_SLURL]）：

 “[MESSAGE]”