Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/

--HG--
branch : product-engine

41 files changed, 320 insertions, 169 deletions

diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index ed8d10a88c..3d2eaed5c5 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -37,6 +37,8 @@
 #include "llpluginclassmedia.h"
 #include "llpluginmessageclasses.h"
 
+#include "llqtwebkit.h"
+
 static int LOW_PRIORITY_TEXTURE_SIZE_DEFAULT = 256;
 
 static int nextPowerOf2( int value )
@@ -124,7 +126,7 @@ void LLPluginClassMedia::reset()
 	mCanPaste = false;
 	mMediaName.clear();
 	mMediaDescription.clear();
-	mBackgroundColor = LLColor4::white;
+	mBackgroundColor = LLColor4(1.0f, 1.0f, 1.0f, 1.0f);
 	
 	// media_browser class
 	mNavigateURI.clear();
@@ -134,6 +136,9 @@ void LLPluginClassMedia::reset()
 	mHistoryForwardAvailable = false;
 	mStatusText.clear();
 	mProgressPercent = 0;	
+	mClickURL.clear();
+	mClickTarget.clear();
+	mClickTargetType = TARGET_NONE;
 	
 	// media_time class
 	mCurrentTime = 0.0f;
@@ -669,6 +674,26 @@ void LLPluginClassMedia::paste()
 	sendMessage(message);
 }
 
+LLPluginClassMedia::ETargetType getTargetTypeFromLLQtWebkit(int target_type)
+{
+	// convert a LinkTargetType value from llqtwebkit to an ETargetType
+	// so that we don't expose the llqtwebkit header in viewer code
+	switch (target_type)
+	{
+	case LinkTargetType::LTT_TARGET_NONE:
+		return LLPluginClassMedia::TARGET_NONE;
+
+	case LinkTargetType::LTT_TARGET_BLANK:
+		return LLPluginClassMedia::TARGET_BLANK;
+
+	case LinkTargetType::LTT_TARGET_EXTERNAL:
+		return LLPluginClassMedia::TARGET_EXTERNAL;
+
+	default:
+		return LLPluginClassMedia::TARGET_OTHER;
+	}
+}
+
 /* virtual */ 
 void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message)
 {
@@ -921,12 +946,15 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message)
 		{
 			mClickURL = message.getValue("uri");
 			mClickTarget = message.getValue("target");
+			U32 target_type = message.getValueU32("target_type");
+			mClickTargetType = ::getTargetTypeFromLLQtWebkit(target_type);
 			mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_CLICK_LINK_HREF);
 		}
 		else if(message_name == "click_nofollow")
 		{
 			mClickURL = message.getValue("uri");
 			mClickTarget.clear();
+			mClickTargetType = TARGET_NONE;
 			mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_CLICK_LINK_NOFOLLOW);
 		}
 		else
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h
index 5a1928ab1d..ebb9099576 100644
--- a/indra/llplugin/llpluginclassmedia.h
+++ b/indra/llplugin/llpluginclassmedia.h
@@ -214,6 +214,17 @@ public:
 	// This is valid after MEDIA_EVENT_CLICK_LINK_HREF
 	std::string getClickTarget() const { return mClickTarget; };
 
+	typedef enum 
+	{
+		TARGET_NONE,        // empty href target string
+		TARGET_BLANK,       // target to open link in user's preferred browser
+		TARGET_EXTERNAL,    // target to open link in external browser
+		TARGET_OTHER        // nonempty and unsupported target type
+	}ETargetType;
+
+	// This is valid after MEDIA_EVENT_CLICK_LINK_HREF
+	ETargetType getClickTargetType() const { return mClickTargetType; };
+
 	std::string getMediaName() const { return mMediaName; };
 	std::string getMediaDescription() const { return mMediaDescription; };
 
@@ -344,6 +355,7 @@ protected:
 	std::string		mLocation;
 	std::string		mClickURL;
 	std::string		mClickTarget;
+	ETargetType     mClickTargetType;
 	
 	/////////////////////////////////////////
 	// media_time class
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index a35d279500..a17e306325 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -1067,10 +1067,6 @@ void LLFloater::setMinimized(BOOL minimize)
 		reshape( mExpandedRect.getWidth(), mExpandedRect.getHeight(), TRUE );
 	}
 	
-	// don't show the help button while minimized - it's
-	// not very useful when minimized and uses up space
-	mButtonsEnabled[BUTTON_HELP] = !minimize;
-
 	applyTitle ();
 
 	make_ui_sound("UISndWindowClose");
@@ -1743,14 +1739,32 @@ void LLFloater::updateButtons()
 	S32 button_count = 0;
 	for (S32 i = 0; i < BUTTON_COUNT; i++)
 	{
-		if(!mButtons[i]) continue;
-		mButtons[i]->setEnabled(mButtonsEnabled[i]);
+		if (!mButtons[i])
+		{
+			continue;
+		}
 
-		if (mButtonsEnabled[i] 
-			//*HACK: always render close button for hosted floaters
-			// so that users don't accidentally hit the button when closing multiple windows
-			// in the chatterbox
-			|| (i == BUTTON_CLOSE && mButtonScale != 1.f))
+		bool enabled = mButtonsEnabled[i];
+		if (i == BUTTON_HELP)
+		{
+			// don't show the help button if the floater is minimized
+			// or if it is a tear-off hosted floater
+			if (isMinimized() || mButtonsEnabled[BUTTON_TEAR_OFF])
+			{
+				enabled = false;
+			}
+		}
+		if (i == BUTTON_CLOSE && mButtonScale != 1.f)
+		{
+			//*HACK: always render close button for hosted floaters so
+			//that users don't accidentally hit the button when
+			//closing multiple windows in the chatterbox
+			enabled = true;
+		}
+
+		mButtons[i]->setEnabled(enabled);
+
+		if (enabled)
 		{
 			button_count++;
 
@@ -1777,7 +1791,7 @@ void LLFloater::updateButtons()
 			// the restore button should have a tab stop so that it takes action when you Ctrl-Tab to a minimized floater
 			mButtons[i]->setTabStop(i == BUTTON_RESTORE);
 		}
-		else if (mButtons[i])
+		else
 		{
 			mButtons[i]->setVisible(FALSE);
 		}
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index a0336f6156..084cdd9561 100644
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -429,6 +429,7 @@ private:
 		LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "click_href");
 		message.setValue("uri", event.getStringValue());
 		message.setValue("target", event.getStringValue2());
+		message.setValueU32("target_type", event.getLinkType());
 		sendMessage(message);
 	}
 	
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 0bfc0db351..958b9521fa 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1761,7 +1761,6 @@ if (INSTALL)
 endif (INSTALL)
 
 if (LL_TESTS)
-else (LL_TESTS)
   # To add a viewer unit test, just add the test .cpp file below
   # This creates a separate test project per file listed.
   include(LLAddBuildTest)
@@ -1769,9 +1768,10 @@ else (LL_TESTS)
     llagentaccess.cpp
     lldateutil.cpp
     llmediadataclient.cpp
-    llviewerhelputil.cpp
     lllogininstance.cpp
+    llviewerhelputil.cpp
   )
+
   ##################################################
   # DISABLING PRECOMPILED HEADERS USAGE FOR TESTS 
   ##################################################
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 184606d495..9c4c8387a8 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3607,7 +3607,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://viewer-help.secondlife.com/[LANGUAGE]/[CHANNEL]/[VERSION]/[TOPIC]</string>
+      <string>http://viewer-help.secondlife.com/[LANGUAGE]/[CHANNEL]/[VERSION]/[TOPIC]/[DEBUG_MODE]</string>
     </map>
     <key>HomeSidePanelURL</key>
     <map>
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp
index aa343b2f69..ef69f39ad2 100644
--- a/indra/newview/llfloaterabout.cpp
+++ b/indra/newview/llfloaterabout.cpp
@@ -269,7 +269,7 @@ LLSD LLFloaterAbout::getInfo()
 	info["VIVOX_VERSION"] = gVoiceClient ? gVoiceClient->getAPIVersion() : LLTrans::getString("NotConnected");
 
 	// TODO: Implement media plugin version query
-	info["QT_WEBKIT_VERSION"] = "4.5.2 (version number hard-coded)";
+	info["QT_WEBKIT_VERSION"] = "4.6 (version number hard-coded)";
 
 	if (gPacketsIn > 0)
 	{
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 20d7f5214b..6e72a7a4f7 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2448,7 +2448,7 @@ void LLFolderBridge::folderOptionsMenu()
 
 	const LLInventoryCategory* category = model->getCategory(mUUID);
 	LLFolderType::EType type = category->getPreferredType();
-	const bool is_default_folder = category && LLFolderType::lookupIsProtectedType(type);
+	const bool is_system_folder = category && LLFolderType::lookupIsProtectedType(type);
 	// BAP change once we're no longer treating regular categories as ensembles.
 	const bool is_ensemble = category && (type == LLFolderType::FT_NONE ||
 										  LLFolderType::lookupIsEnsembleType(type));
@@ -2462,8 +2462,8 @@ void LLFolderBridge::folderOptionsMenu()
 		mItems.push_back("Delete");
 	}
 
-	// Only enable calling-card related options for non-default folders.
-	if (!is_sidepanel && !is_default_folder)
+	// Only enable calling-card related options for non-system folders.
+	if (!is_sidepanel && !is_system_folder)
 	{
 		LLIsType is_callingcard(LLAssetType::AT_CALLINGCARD);
 		if (mCallingCards || checkFolderForContentsOfType(model, is_callingcard))
@@ -2497,10 +2497,14 @@ void LLFolderBridge::folderOptionsMenu()
 			mItems.push_back(std::string("Folder Wearables Separator"));
 		}
 
-		// Only enable add/replace outfit for non-default folders.
-		if (!is_default_folder)
+		// Only enable add/replace outfit for non-system folders.
+		if (!is_system_folder)
 		{
-			mItems.push_back(std::string("Add To Outfit"));
+			// Adding an outfit onto another (versus replacing) doesn't make sense.
+			if (type != LLFolderType::FT_OUTFIT)
+			{
+				mItems.push_back(std::string("Add To Outfit"));
+			}
 			mItems.push_back(std::string("Replace Outfit"));
 		}
 		if (is_ensemble)
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 711114173c..c603af9166 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1994,21 +1994,23 @@ void LLInventoryModel::accountForUpdate(const LLCategoryUpdate& update) const
 				descendents_actual += update.mDescendentDelta;
 				cat->setDescendentCount(descendents_actual);
 				cat->setVersion(++version);
-				llinfos << "accounted: '" << cat->getName() << "' "
-						<< version << " with " << descendents_actual
-						<< " descendents." << llendl;
+				lldebugs << "accounted: '" << cat->getName() << "' "
+						 << version << " with " << descendents_actual
+						 << " descendents." << llendl;
 			}
 		}
 		if(!accounted)
 		{
-			lldebugs << "No accounting for: '" << cat->getName() << "' "
+			// Error condition, this means that the category did not register that
+			// it got new descendents (perhaps because it is still being loaded)
+			// which means its descendent count will be wrong.
+			llwarns << "Accounting failed for '" << cat->getName() << "' version:"
 					 << version << llendl;
 		}
 	}
 	else
 	{
-		llwarns << "No category found for update " << update.mCategoryID
-				<< llendl;
+		llwarns << "No category found for update " << update.mCategoryID << llendl;
 	}
 }
 
diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
index 2d9ea21b5f..2fb8aea4e9 100644
--- a/indra/newview/llinventoryobserver.cpp
+++ b/indra/newview/llinventoryobserver.cpp
@@ -311,10 +311,10 @@ bool LLInventoryFetchDescendentsObserver::isEverythingComplete() const
 
 bool LLInventoryFetchDescendentsObserver::isComplete(LLViewerInventoryCategory* cat)
 {
-	S32 version = cat->getVersion();
-	S32 descendents = cat->getDescendentCount();
-	if((LLViewerInventoryCategory::VERSION_UNKNOWN == version)
-	   || (LLViewerInventoryCategory::DESCENDENT_COUNT_UNKNOWN == descendents))
+	const S32 version = cat->getVersion();
+	const S32 expected_num_descendents = cat->getDescendentCount();
+	if ((version == LLViewerInventoryCategory::VERSION_UNKNOWN) ||
+		(expected_num_descendents == LLViewerInventoryCategory::DESCENDENT_COUNT_UNKNOWN))
 	{
 		return false;
 	}
@@ -325,15 +325,28 @@ bool LLInventoryFetchDescendentsObserver::isComplete(LLViewerInventoryCategory*
 	gInventory.getDirectDescendentsOf(cat->getUUID(), cats, items);
 	if(!cats || !items)
 	{
-		// bit of a hack - pretend we're done if they are gone or
-		// incomplete. should never know, but it would suck if this
-		// kept tight looping because of a corrupt memory state.
+		llwarns << "Category '" << cat->getName() << "' descendents corrupted, fetch failed." << llendl;
+		// NULL means the call failed -- cats/items map doesn't exist (note: this does NOT mean
+		// that the cat just doesn't have any items or subfolders).
+		// Unrecoverable, so just return done so that this observer can be cleared
+		// from memory.
 		return true;
 	}
-	S32 known = cats->count() + items->count();
-	if(descendents == known)
+	const S32 current_num_known_descendents = cats->count() + items->count();
+	
+	// Got the number of descendents that we were expecting, so we're done.
+	if (current_num_known_descendents == expected_num_descendents)
+	{
+		return true;
+	}
+
+	// Error condition, but recoverable.  This happens if something was added to the
+	// category before it was initialized, so accountForUpdate didn't update descendent
+	// count and thus the category thinks it has fewer descendents than it actually has.
+	if (current_num_known_descendents >= expected_num_descendents)
 	{
-		// hey - we're done.
+		llwarns << "Category '" << cat->getName() << "' expected descendentcount:" << expected_num_descendents << " descendents but got descendentcount:" << current_num_known_descendents << llendl;
+		cat->setDescendentCount(current_num_known_descendents);
 		return true;
 	}
 	return false;
@@ -352,7 +365,7 @@ void LLInventoryFetchComboObserver::changed(U32 mask)
 				continue;
 			}
 			if(item->isComplete())
-			{
+		{	
 				mCompleteItems.push_back(*it);
 				it = mIncompleteItems.erase(it);
 				continue;
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp
index 6b0f9b709d..87ebce1d34 100644
--- a/indra/newview/llmediactrl.cpp
+++ b/indra/newview/llmediactrl.cpp
@@ -84,7 +84,6 @@ LLMediaCtrl::LLMediaCtrl( const Params& p) :
 	mHomePageUrl( "" ),
 	mIgnoreUIScale( true ),
 	mAlwaysRefresh( false ),
-	mExternalUrl( "" ),
 	mMediaSource( 0 ),
 	mTakeFocusOnClick( true ),
 	mCurrentNavUrl( "" ),
@@ -877,9 +876,27 @@ bool LLMediaCtrl::onClickLinkExternalTarget(const LLSD& notification, const LLSD
 	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
 	if ( 0 == option )
 	{
-		// open in external browser because we don't support 
-		// creation of our own secondary browser windows
-		LLWeb::loadURLExternal( notification["payload"]["external_url"].asString() );
+		LLSD payload = notification["payload"];
+		std::string url = payload["url"].asString();
+		S32 target_type = payload["target_type"].asInteger();
+
+		switch (target_type)
+		{
+		case LLPluginClassMedia::TARGET_EXTERNAL:
+			// load target in an external browser
+			LLWeb::loadURLExternal(url);
+			break;
+
+		case LLPluginClassMedia::TARGET_BLANK:
+			// load target in the user's preferred browser
+			LLWeb::loadURL(url);
+			break;
+
+		default:
+			// unsupported link target - shouldn't happen
+			LL_WARNS("LinkTarget") << "Unsupported link target type" << LL_ENDL;
+			break;
+		}
 	}
 	return false;
 }
@@ -993,20 +1010,18 @@ void LLMediaCtrl::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
 void LLMediaCtrl::onClickLinkHref( LLPluginClassMedia* self )
 {
 	// retrieve the event parameters
-	std::string target = self->getClickTarget();
 	std::string url = self->getClickURL();
+	U32 target_type = self->getClickTargetType();
 	
-	// if there is a value for the target
-	if ( !target.empty() )
+	// is there is a target specified for the link?
+	if (target_type == LLPluginClassMedia::TARGET_EXTERNAL ||
+		target_type == LLPluginClassMedia::TARGET_BLANK)
 	{
-		if ( target == "_external" )		
-		{
-			mExternalUrl = url;
-			LLSD payload;
-			payload["external_url"] = mExternalUrl;
-			LLNotificationsUtil::add( "WebLaunchExternalTarget", LLSD(), payload, onClickLinkExternalTarget);
-			return;
-		}
+		LLSD payload;
+		payload["url"] = url;
+		payload["target_type"] = LLSD::Integer(target_type);
+		LLNotificationsUtil::add( "WebLaunchExternalTarget", LLSD(), payload, onClickLinkExternalTarget);
+		return;
 	}
 
 	const std::string protocol1( "http://" );
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h
index 8f9e6e7179..b0aca3cfa4 100644
--- a/indra/newview/llmediactrl.h
+++ b/indra/newview/llmediactrl.h
@@ -182,7 +182,6 @@ public:
 		bool mOpenLinksInInternalBrowser;
 		bool mTrusted;
 		std::string mHomePageUrl;
-		std::string mExternalUrl;
 		std::string mCurrentNavUrl;
 		bool mIgnoreUIScale;
 		bool mAlwaysRefresh;
diff --git a/indra/newview/llpaneloutfitsinventory.cpp b/indra/newview/llpaneloutfitsinventory.cpp
index 550fee71bf..e058b3b326 100644
--- a/indra/newview/llpaneloutfitsinventory.cpp
+++ b/indra/newview/llpaneloutfitsinventory.cpp
@@ -280,6 +280,7 @@ void LLPanelOutfitsInventory::updateListCommands()
 
 	mListCommands->childSetEnabled("trash_btn", trash_enabled);
 	mListCommands->childSetEnabled("wear_btn", wear_enabled);
+	mListCommands->childSetVisible("wear_btn", wear_enabled);
 	mListCommands->childSetEnabled("make_outfit_btn", make_outfit_enabled);
 }
 
diff --git a/indra/newview/llviewerhelputil.cpp b/indra/newview/llviewerhelputil.cpp
index 5ba4fc834c..ffc5761372 100644
--- a/indra/newview/llviewerhelputil.cpp
+++ b/indra/newview/llviewerhelputil.cpp
@@ -34,6 +34,7 @@
 #include "llviewerprecompiledheaders.h"
 #include "llviewerhelputil.h"
 
+#include "llagent.h"
 #include "llsd.h"
 #include "llstring.h"
 #include "lluri.h"
@@ -63,6 +64,7 @@ std::string LLViewerHelpUtil::buildHelpURL( const std::string &topic)
 {
 	LLSD substitution;
 	substitution["TOPIC"] = helpURLEncode(topic);
+	substitution["DEBUG_MODE"] = gAgent.isGodlike() ? "debug" : "";
 	
 	// get the help URL and expand all of the substitutions
 	// (also adds things like [LANGUAGE], [VERSION], [OS], etc.)
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 023c288d92..1d07b5d489 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -1006,6 +1006,8 @@ LLViewerMediaImpl::LLViewerMediaImpl(	  const LLUUID& texture_id,
 	mInNearbyMediaList(false),
 	mClearCache(false),
 	mBackgroundColor(LLColor4::white),
+	mNavigateSuspended(false),
+	mNavigateSuspendedDeferred(false),
 	mIsUpdated(false)
 { 
 
@@ -1696,6 +1698,13 @@ void LLViewerMediaImpl::navigateInternal()
 	// Helpful to have media urls in log file. Shouldn't be spammy.
 	llinfos << "media id= " << mTextureId << " url=" << mMediaURL << " mime_type=" << mMimeType << llendl;
 
+	if(mNavigateSuspended)
+	{
+		llwarns << "Deferring navigate." << llendl;
+		mNavigateSuspendedDeferred = true;
+		return;
+	}
+	
 	if(mMimeTypeProbe != NULL)
 	{
 		llwarns << "MIME type probe already in progress -- bailing out." << llendl;
@@ -1902,7 +1911,17 @@ void LLViewerMediaImpl::update()
 		return;
 	}
 	
+	// Make sure a navigate doesn't happen during the idle -- it can cause mMediaSource to get destroyed, which can cause a crash.
+	setNavigateSuspended(true);
+	
 	mMediaSource->idle();
+
+	setNavigateSuspended(false);
+
+	if(mMediaSource == NULL)
+	{
+		return;
+	}
 	
 	if(mMediaSource->isPluginExited())
 	{
@@ -2559,6 +2578,23 @@ void LLViewerMediaImpl::setNavState(EMediaNavState state)
 	}
 }
 
+void LLViewerMediaImpl::setNavigateSuspended(bool suspend)
+{
+	if(mNavigateSuspended != suspend)
+	{
+		mNavigateSuspended = suspend;
+		if(!suspend)
+		{
+			// We're coming out of suspend.  If someone tried to do a navigate while suspended, do one now instead.
+			if(mNavigateSuspendedDeferred)
+			{
+				mNavigateSuspendedDeferred = false;
+				navigateInternal();
+			}
+		}
+	}
+}
+
 void LLViewerMediaImpl::cancelMimeTypeProbe()
 {
 	if(mMimeTypeProbe != NULL)
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index 8a5cd804aa..668f3b563d 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -326,6 +326,9 @@ public:
 	EMediaNavState getNavState() { return mMediaNavState; }
 	void setNavState(EMediaNavState state);
 	
+	void setNavigateSuspended(bool suspend);
+	bool isNavigateSuspended() { return mNavigateSuspended; };
+	
 	void cancelMimeTypeProbe();
 private:
 	// a single media url with some data and an impl.
@@ -372,6 +375,8 @@ private:
 	bool mInNearbyMediaList;	// used by LLFloaterNearbyMedia::refreshList() for performance reasons
 	bool mClearCache;
 	LLColor4 mBackgroundColor;
+	bool mNavigateSuspended;
+	bool mNavigateSuspendedDeferred;
 	
 private:
 	BOOL mIsUpdated ;
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 403965560b..ba4b8a6ae5 100644
--- a/indra/newview/skins/default/xui/de/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/de/floater_build_options.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>

 <floater name="build options floater" title="RASTER-OPTIONEN">

-	<spinner label="Rastereinheit (Meter)" name="GridResolution"/>

+	<spinner label="Raster-Einheiten (Meter)" name="GridResolution"/>

 	<spinner label="Rastergröße (Meter)" name="GridDrawSize"/>

-	<check_box label="An Untereinheiten ausrichten" name="GridSubUnit"/>

-	<check_box label="Querschnitte anzeigen" name="GridCrossSection"/>

-	<text name="grid_opacity_label" tool_tip="Rasterdeckkraft">

+	<check_box label="Einrasten von Untereinheiten aktivieren" name="GridSubUnit"/>

+	<check_box label="Überschneidungen anzeigen" name="GridCrossSection"/>

+	<text name="grid_opacity_label" tool_tip="Raster-Deckkraft">

 		Deckkraft:

 	</text>

 	<slider label="Rasterdeckkraft" name="GridOpacity"/>

diff --git a/indra/newview/skins/default/xui/de/floater_buy_currency.xml b/indra/newview/skins/default/xui/de/floater_buy_currency.xml
index 3c336cc40b..c320e796c2 100644
--- a/indra/newview/skins/default/xui/de/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_currency.xml
@@ -46,7 +46,7 @@
 		[AMT] L$

 	</text>

 	<text name="currency_links">

-		[http://www.secondlife.com/ payment method] | [http://www.secondlife.com/ currency] | [http://www.secondlife.com exchange rate]

+		[http://www.secondlife.com/my/account/payment_method_management.php?lang=de-DE payment method] | [http://www.secondlife.com/my/account/currency.php?lang=de-DE currency] | [http://www.secondlife.com/my/account/exchange_rates.php?lang=de-DE exchange rate]

 	</text>

 	<text name="exchange_rate_note">

 		Geben Sie den Betrag erneut ein, um die aktuellste Umtauschrate anzuzeigen.

diff --git a/indra/newview/skins/default/xui/de/floater_help_browser.xml b/indra/newview/skins/default/xui/de/floater_help_browser.xml
index 53bddcced1..2344d6f412 100644
--- a/indra/newview/skins/default/xui/de/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/de/floater_help_browser.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>

 <floater name="floater_help_browser" title="HILFE-BROWSER">

 	<floater.string name="home_page_url">

-		http://www.secondlife.com

+		http://de.secondlife.com

 	</floater.string>

 	<floater.string name="support_page_url">

-		http://support.secondlife.com

+		http://de.secondlife.com/support

 	</floater.string>

 	<layout_stack name="stack1">

 		<layout_panel name="external_controls">

diff --git a/indra/newview/skins/default/xui/de/floater_preferences.xml b/indra/newview/skins/default/xui/de/floater_preferences.xml
index 4ec709d508..01fde2e697 100644
--- a/indra/newview/skins/default/xui/de/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/de/floater_preferences.xml
@@ -5,11 +5,11 @@
 	<tab_container name="pref core">

 		<panel label="Allgemein" name="general"/>

 		<panel label="Grafik" name="display"/>

-		<panel label="Datenschutzbestimmungen (EN)" name="im"/>

+		<panel label="Privatsphäre" name="im"/>

 		<panel label="Sound" name="audio"/>

 		<panel label="Chat" name="chat"/>

-		<panel label="Warnhinweise" name="msgs"/>

-		<panel label="Hardware &amp; Web" name="input"/>

+		<panel label="Benachrichtigungen" name="msgs"/>

+		<panel label="Setup" name="input"/>

 		<panel label="Erweitert" name="advanced1"/>

 	</tab_container>

 </floater>

diff --git a/indra/newview/skins/default/xui/de/menu_hide_navbar.xml b/indra/newview/skins/default/xui/de/menu_hide_navbar.xml
index 482cbf37d4..b8bca2f0fd 100644
--- a/indra/newview/skins/default/xui/de/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/de/menu_hide_navbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>

 <menu name="hide_navbar_menu">

-	<menu_item_check label="Navigations-Leiste anzeigen" name="ShowNavbarNavigationPanel"/>

+	<menu_item_check label="Navigationsleiste anzeigen" name="ShowNavbarNavigationPanel"/>

 	<menu_item_check label="Favoritenleiste anzeigen" name="ShowNavbarFavoritesPanel"/>

 </menu>

diff --git a/indra/newview/skins/default/xui/de/menu_navbar.xml b/indra/newview/skins/default/xui/de/menu_navbar.xml
index e0639f9b76..9ff37b53dc 100644
--- a/indra/newview/skins/default/xui/de/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/de/menu_navbar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>

 <menu name="Navbar Menu">

 	<menu_item_check label="Koordinaten anzeigen" name="Show Coordinates"/>

-	<menu_item_check label="Parzellen-Eigenschaften anzeigen" name="Show Parcel Properties"/>

+	<menu_item_check label="Parzelleneigenschaften anzeigen" name="Show Parcel Properties"/>

 	<menu_item_call label="Landmarke" name="Landmark"/>

 	<menu_item_call label="Ausschneiden" name="Cut"/>

 	<menu_item_call label="Kopieren" name="Copy"/>

diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml
index b5d3389ce8..e3e7977efd 100644
--- a/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">

 	<menu_item_check label="Nach letzten Sprechern sortieren" name="sort_by_recent_speakers"/>

 	<menu_item_check label="Nach Name sortieren" name="sort_name"/>

-	<menu_item_check label="Nach Nähe sortieren" name="sort_distance"/>

-	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>

-	<menu_item_call label="Ignorierte Einwohner &amp; Objekte anzeigen" name="show_blocked_list"/>

+	<menu_item_check label="Nach Entfernung sortieren" name="sort_distance"/>

+	<menu_item_check label="Profilbilder anzeigen" name="view_icons"/>

+	<menu_item_call label="Zeige geblockte Einwohner &amp; Objekte" name="show_blocked_list"/>

 </menu>

diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 9a3973ffd3..9780c78e1b 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -253,10 +253,8 @@ Für die gesamte Region ist Schaden aktiviert.
 Damit Waffen funktionieren, müssen Skripts erlaubt sein.

 	</notification>

 	<notification name="MultipleFacesSelected">

-		Mehrere Flächen wurden ausgewählt.

-Wenn Sie fortfahren werden auf mehrere Flächen des Objekts unterschiedlichen Medien-Instanzen eingefügt.

-Um Medien nur auf einer Fläche einzufügen, wählen Sie &quot;Textur auswählen&quot; und klicken Sie auf die gewünschte Fläche des Objektes. Klicken Sie dann auf „Hinzufügen&quot;.

-		<usetemplate ignoretext="Medien werden auf mehreren ausgewählten Flächen eingefügt." name="okcancelignore" notext="Abbrechen" yestext="OK"/>

+		Momentan sind mehrere Seiten ausgewählt. Wenn Sie fortfahren, werden einzelne Medien auf mehreren Seiten des Objektes dargestellt. Um die Medien auf einer einzigen Seite darzustellen, wählen Sie Textur auswählen und klicken Sie auf die gewünschte Seite. Danach klicken Sie Hinzufügen.

+		<usetemplate ignoretext="Die Medien werden auf mehrere ausgewählte Seiten übertragen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>

 	</notification>

 	<notification name="WhiteListInvalidatesHomeUrl">

 		Wenn Sie diesen Eintrag zur Whitelist hinzufügen, dann wird die URL, 

@@ -329,8 +327,8 @@ Gebühren werden nicht rückerstattet.
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>

 	</notification>

 	<notification name="DeleteMedia">

-		Sie haben die mit dieser Fläche verknüpften Medien ausgewählt, um diese zu löschen.

-Möchten Sie fortfahren?

+		Sie haben sich entschieden, die Medien auf dieser Seite zu löschen.

+Sind Sie sicher, dass Sie fortfahren wollen?

 		<usetemplate ignoretext="Bestätigen, bevor ich Medien von einem Objekt entferne." name="okcancelignore" notext="Nein" yestext="Ja"/>

 	</notification>

 	<notification name="ClassifiedSave">

diff --git a/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml
index 677a32275d..fb08cbdda7 100644
--- a/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>

 <panel label="Gruppeninfo" name="GroupInfo">

 	<panel.string name="default_needs_apply_text">

-		Die Registerkarte enthält nicht gespeicherte Änderungen.

+		In der aktuellen Registerkarte befinden sich ungesicherte Änderungen

 	</panel.string>

 	<panel.string name="want_apply_text">

-		Diese Änderungen speichern?

+		Möchten Sie diese Änderungen speichern?

 	</panel.string>

 	<panel.string name="group_join_btn">

-		Mitglied werden ([AMOUNT] L$)

+		Beitreten ([AMOUNT]L$)

 	</panel.string>

 	<panel.string name="group_join_free">

 		Kostenlos

 	</panel.string>

-	<text name="group_name" value="(wird geladen...)"/>

-	<line_editor label="Neuen Gruppennamen hier eingeben" name="group_name_editor"/>

-	<texture_picker label="" name="insignia" tool_tip="Zum Auswählen eines Bildes hier klicken"/>

+	<text name="group_name" value="(Lädt...)"/>

+	<line_editor label="Geben Sie Ihren neuen Gruppennamen hier ein" name="group_name_editor"/>

+	<texture_picker label="" name="insignia" tool_tip="Klicken Sie, um ein Bild auszuwählen"/>

 	<text name="prepend_founded_by">

 		Gründer:

 	</text>

-	<name_box initial_value="(wird in Datenbank gesucht)" name="founder_name"/>

+	<name_box initial_value="(empfange)" name="founder_name"/>

 	<text name="join_cost_text">

 		Kostenlos

 	</text>

@@ -27,10 +27,10 @@
 		<accordion_tab name="group_general_tab" title="Allgemein"/>

 		<accordion_tab name="group_roles_tab" title="Rollen"/>

 		<accordion_tab name="group_notices_tab" title="Mitteilungen"/>

-		<accordion_tab name="group_land_tab" title="Land/Vermögen"/>

+		<accordion_tab name="group_land_tab" title="Land/Kapital"/>

 	</accordion>

 	<panel name="button_row">

-		<button label="Bauen" label_selected="Neue Gruppe" name="btn_create"/>

+		<button label="Erstellen" label_selected="Neue Gruppe" name="btn_create"/>

 		<button label="Speichern" label_selected="Speichern" name="btn_apply"/>

 	</panel>

 </panel>

diff --git a/indra/newview/skins/default/xui/de/panel_media_settings_general.xml b/indra/newview/skins/default/xui/de/panel_media_settings_general.xml
index 20771a980b..c5fd4d5be4 100644
--- a/indra/newview/skins/default/xui/de/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_media_settings_general.xml
@@ -1,36 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>

 <panel label="Allgemein" name="Media Settings General">

 	<text name="home_label">

-		Start URL:

+		Home-URL:

 	</text>

-	<line_editor name="home_url" tool_tip="Die Start-URL für diese Medienquelle"/>

+	<text name="home_fails_whitelist_label">

+		(Diese URL befindet sich nicht auf der festgelegten Whitelist)

+	</text>

+	<line_editor name="home_url" tool_tip="Die Home-URL für diese Medienquelle"/>

 	<text name="preview_label">

 		Vorschau

 	</text>

 	<text name="current_url_label">

-		Aktuelle URL:

+		Derzeitige URL:

 	</text>

-	<line_editor name="current_url" tool_tip="Die aktuelle URL für diese Medienquelle" value=""/>

+	<text name="current_url" tool_tip="Die derzeitige URL für diese Medienquelle" value=""/>

 	<button label="Zurücksetzen" name="current_url_reset_btn"/>

-	<text name="controls_label">

-		Steuerung:

-	</text>

-	<combo_box name="controls">

-		<combo_item name="Standard">

-			Standard

-		</combo_item>

-		<combo_item name="Mini">

-			Mini

-		</combo_item>

-	</combo_box>

-	<check_box initial_value="false" label="Auto-Loop" name="auto_loop"/>

-	<check_box initial_value="false" label="Interaktion bei erstem Anklicken" name="first_click_interact"/>

-	<check_box initial_value="false" label="Auto-Zoom" name="auto_zoom"/>

-	<check_box initial_value="false" label="Medien automatisch wiedergeben" name="auto_play"/>

+	<check_box initial_value="false" label="Automatisch wiederholen" name="auto_loop"/>

+	<check_box initial_value="false" label="Interaktion beim ersten Anklicken" name="first_click_interact"/>

+	<check_box initial_value="false" label="Automatisch zoomen" name="auto_zoom"/>

+	<check_box initial_value="false" label="Medien automatisch abspielen" name="auto_play"/>

 	<text name="media_setting_note">

-		Hinweis: Einwohner können diese Einstellung ausschalten

+		Hinweis: Einwohner können diese Einstellung überschreiben

 	</text>

-	<check_box initial_value="false" label="Medien auf Objektoberfläche automatisch skalieren" name="auto_scale"/>

+	<check_box initial_value="false" label="Medien automatisch auf Objektflächen skalieren" name="auto_scale"/>

 	<text name="size_label">

 		Größe:

 	</text>

diff --git a/indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml
index 0db0be2dcb..d05b0d8808 100644
--- a/indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>

 <panel label="Steuerung" name="Media settings for controls">

-	<check_box initial_value="false" label="Naviation &amp; Interaktion deaktivieren" name="perms_owner_interact"/>

-	<check_box initial_value="false" label="Steuerleiste ausblenden" name="perms_owner_control"/>

-	<check_box initial_value="false" label="Naviation &amp; Interaktion deaktivieren" name="perms_group_interact"/>

-	<check_box initial_value="false" label="Steuerleiste ausblenden" name="perms_group_control"/>

-	<check_box initial_value="false" label="Naviation &amp; Interaktion deaktivieren" name="perms_anyone_interact"/>

-	<check_box initial_value="false" label="Steuerleiste ausblenden" name="perms_anyone_control"/>

+	<check_box initial_value="false" label="Navigation &amp; Interaktivität deaktivieren" name="perms_owner_interact"/>

+	<check_box initial_value="false" label="Kontrollleiste verstecken" name="perms_owner_control"/>

+	<check_box initial_value="false" label="Navigation &amp; Interaktivität deaktivieren" name="perms_group_interact"/>

+	<check_box initial_value="false" label="Kontrollleiste verstecken" name="perms_group_control"/>

+	<check_box initial_value="false" label="Navigation &amp; Interaktivität deaktivieren" name="perms_anyone_interact"/>

+	<check_box initial_value="false" label="Kontrollleiste verstecken" name="perms_anyone_control"/>

 </panel>

diff --git a/indra/newview/skins/default/xui/de/panel_media_settings_security.xml b/indra/newview/skins/default/xui/de/panel_media_settings_security.xml
index 2fcd18864d..a5d378f95b 100644
--- a/indra/newview/skins/default/xui/de/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/de/panel_media_settings_security.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>

 <panel label="Sicherheit" name="Media Settings Security">

-	<check_box initial_value="false" label="Nur Zugangz zu festgelegten URLs (nach Präfix) erlauben" name="whitelist_enable"/>

+	<check_box initial_value="false" label="Zugang nur für bestimmte URLs ermöglichen (mittels Präfix)" name="whitelist_enable"/>

+	<text name="home_url_fails_some_items_in_whitelist">

+		Einträge, die auf ungültige Home-URLs hinweisen, sind markiert:

+	</text>

 	<button label="Hinzufügen" name="whitelist_add"/>

 	<button label="Löschen" name="whitelist_del"/>

+	<text name="home_url_fails_whitelist">

+		Warnung: Die Home-URL, die in der Registerkarte &quot;Allgemein&quot; angegeben wurde, entspricht nicht den Einträgen auf der Whitelist. Sie wurde deaktiviert, bis ein gültiger Eintrag angegeben wird.

+	</text>

 </panel>

diff --git a/indra/newview/skins/default/xui/de/panel_navigation_bar.xml b/indra/newview/skins/default/xui/de/panel_navigation_bar.xml
index 3324556f98..1a67e9e45f 100644
--- a/indra/newview/skins/default/xui/de/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/de/panel_navigation_bar.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>

 <panel name="navigation_bar">

 	<panel name="navigation_panel">

-		<button name="back_btn" tool_tip="Zurück zu vorheriger Position"/>

-		<button name="forward_btn" tool_tip="Eine Position weiter"/>

-		<button name="home_btn" tool_tip="An meinen Heimatort teleportieren"/>

-		<location_input label="Ort" name="location_combo"/>

-		<search_combo_box label="Suchen" name="search_combo_box" tool_tip="Suchen">

+		<button name="back_btn" tool_tip="Zurück zum vorherigen Standort gehen"/>

+		<button name="forward_btn" tool_tip="Um einen Standort weiter gehen"/>

+		<button name="home_btn" tool_tip="Zu meinem Heimatort teleportieren"/>

+		<location_input label="Standort" name="location_combo"/>

+		<search_combo_box label="Suche" name="search_combo_box" tool_tip="Suche">

 			<combo_editor label="[SECOND_LIFE] durchsuchen" name="search_combo_editor"/>

 		</search_combo_box>

 	</panel>

+	<favorites_bar name="favorite">

+		<chevron_button name="&gt;&gt;" tool_tip="Zeige weitere meiner Favoriten an"/>

+	</favorites_bar>

 </panel>

diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
index 8e7d586fc3..e5bf1f5806 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
@@ -4,7 +4,7 @@
 		Sprache:

 	</text>

 	<combo_box name="language_combobox">

-		<combo_box.item label="Systemstandard" name="System Default Language"/>

+		<combo_box.item label="Systemvorgabe" name="System Default Language"/>

 		<combo_box.item label="English (Englisch)" name="English"/>

 		<combo_box.item label="Danks (Dänisch) - Beta" name="Danish"/>

 		<combo_box.item label="Deutsch - Beta" name="Deutsch(German)"/>

@@ -18,7 +18,7 @@
 		<combo_box.item label="Testsprache" name="TestLanguage"/>

 	</combo_box>

 	<text name="language_textbox2">

-		(Neustart erforderlich)

+		(Erfordert Neustart)

 	</text>

 	<text name="maturity_desired_prompt">

 		Ich möchte auf Inhalt mit folgender Alterseinstufung zugreifen:

@@ -27,40 +27,40 @@
 	<combo_box name="maturity_desired_combobox">

 		<combo_box.item label="PG, Mature und Adult" name="Desired_Adult"/>

 		<combo_box.item label="PG und Mature" name="Desired_Mature"/>

-		<combo_box.item label="PG" name="Desired_PG"/>

+		<combo_box.item label="Allgemein" name="Desired_PG"/>

 	</combo_box>

 	<text name="start_location_textbox">

-		Startposition:

+		Startstandort:

 	</text>

 	<combo_box name="start_location_combo">

 		<combo_box.item label="Mein letzter Standort" name="MyLastLocation" tool_tip="Als Standardeinstellung in letztem Standort anmelden."/>

 		<combo_box.item label="Mein Heimatort" name="MyHome" tool_tip="Als Standardeinstellung in Zuhauseposition anmelden."/>

 	</combo_box>

-	<check_box initial_value="true" label="Bei Anmeldung anzeigen" name="show_location_checkbox"/>

+	<check_box initial_value="true" label="Beim Anmelden anzeigen" name="show_location_checkbox"/>

 	<text name="name_tags_textbox">

-		Namensschilder:

+		Avatarnamen:

 	</text>

 	<radio_group name="Name_Tag_Preference">

 		<radio_item label="Aus" name="radio"/>

-		<radio_item label="Ein" name="radio2"/>

-		<radio_item label="Kurz anzeigen" name="radio3"/>

+		<radio_item label="An" name="radio2"/>

+		<radio_item label="Vorübergehend anzeigen" name="radio3"/>

 	</radio_group>

 	<check_box label="Meinen Namen anzeigen" name="show_my_name_checkbox1"/>

-	<check_box initial_value="true" label="Kleine Namensschilder" name="small_avatar_names_checkbox"/>

+	<check_box initial_value="true" label="Kleine Avatarnamen" name="small_avatar_names_checkbox"/>

 	<check_box label="Gruppentitel anzeigen" name="show_all_title_checkbox1"/>

 	<text name="effects_color_textbox">

 		Meine Effekte:

 	</text>

 	<color_swatch label="" name="effect_color_swatch" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>

 	<text name="title_afk_text">

-		Timeout für Abwesenheit:

+		Zeit bis zur Abwesenheit:

 	</text>

 	<spinner label="" name="afk_timeout_spinner"/>

 	<text name="seconds_textbox">

 		Sekunden

 	</text>

 	<text name="text_box3">

-		Beschäftigt-Modus-Antwort:

+		Antwort, wenn im „Beschäftigt“-Modus:

 	</text>

 	<text_editor name="busy_response">

 		log_in_to_change

diff --git a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
index 056998c503..221d736cf9 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>

 <panel label="Kommunikation" name="im">

 	<panel.string name="log_in_to_change">

-		Zum Ändern anmelden

+		Anmelden, um Änderungen vorzunehmen

 	</panel.string>

-	<button label="Cache löschen" name="clear_cache"/>

+	<button label="Verlauf leeren" name="clear_cache"/>

 	<text name="cache_size_label_l">

-		(Positionen, Bilder, Internet, Suchverlauf)

+		(Standorte, Bilder, Web, Suchverlauf)

 	</text>

-	<check_box label="Nur Freunden und Gruppen meinen Online-Status mitteilen" name="online_visibility"/>

-	<check_box label="Nur IMs und Anrufe von Freunden oder Gruppen durchstellen" name="voice_call_friends_only_check"/>

-	<check_box label="Nach Beendigung von Anrufen Mikrofon abschalten." name="auto_disengage_mic_check"/>

+	<check_box label="Nur Freunde und Gruppen wissen, dass ich online bin" name="online_visibility"/>

+	<check_box label="Nur Freunde und Gruppen können mich anrufen oder mir eine IM schicken" name="voice_call_friends_only_check"/>

+	<check_box label="Mikrofon ausschalten, wenn Anrufe beendet werden" name="auto_disengage_mic_check"/>

 	<check_box label="Cookies annehmen" name="cookies_enabled"/>

-	<check_box label="Medien automatisch wiedergeben" name="autoplay_enabled"/>

-	<check_box label="Medien auf Parzelle automatisch wiedergeben" name="parcel_autoplay_enabled"/>

+	<check_box label="Automatisches Abspielen von Medien erlauben" name="autoplay_enabled"/>

+	<check_box label="Medien auf Parzellen automatisch abspielen" name="parcel_autoplay_enabled"/>

 	<text name="Logs:">

-		Logs:

+		Protokolle:

 	</text>

-	<check_box label="Protokoll von Chats &quot;in meiner Nähe&quot; auf meinem Computer speichern" name="log_nearby_chat"/>

-	<check_box label="IM-Protokolle auf meinem Computer speichern" name="log_instant_messages"/>

-	<check_box label="Zeitangabe hinzufügen" name="show_timestamps_check_im"/>

+	<check_box label="Protokolle von Gesprächen in der Nähe auf meinem Computer speichern" name="log_nearby_chat"/>

+	<check_box label="IM Protokolle auf meinem Computer speichern" name="log_instant_messages"/>

+	<check_box label="Zeitstempel hinzufügen" name="show_timestamps_check_im"/>

 	<text name="log_path_desc">

-		Speicherort für Protokolle

+		Speicherort der Protokolldateien

 	</text>

 	<button label="Durchsuchen" label_selected="Durchsuchen" name="log_path_button"/>

 	<button label="Ignorierte Einwohner/Objekte" name="block_list"/>

diff --git a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
index 662662d132..e37e2734a6 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
@@ -15,32 +15,32 @@
 		Maximale Bandbreite

 	</text>

 	<text name="text_box2">

-		kbps

+		kbit/s

 	</text>

-	<check_box label="Benutzerdefinierter Port" name="connection_port_enabled"/>

-	<spinner label="Port-Nummer:" name="web_proxy_port"/>

+	<check_box label="Eigener Port" name="connection_port_enabled"/>

+	<spinner label="Portnummer:" name="web_proxy_port"/>

 	<text name="cache_size_label_l">

-		Cache

+		Cachegröße

 	</text>

 	<text name="text_box5">

 		MB

 	</text>

 	<button label="Durchsuchen" label_selected="Durchsuchen" name="set_cache"/>

-	<button label="Zurücksetzen" label_selected="Festlegen" name="reset_cache"/>

+	<button label="Zurücksetzen" label_selected="Set" name="reset_cache"/>

 	<text name="Cache location">

-		Cache-Ordner

+		Speicherort des Caches

 	</text>

 	<text name="Web:">

-		Internet:

+		Web:

 	</text>

 	<radio_group name="use_external_browser">

-		<radio_item label="Integrierten Browser verwenden" name="internal" tool_tip="Den integrierten Browser für Hilfe, Internetlinks, usw. verwenden. Der Browser wird als eigenständiges Fenster in [APP_NAME] geöffnet."/>

-		<radio_item label="Meinen Browser verwenden (IE, Firefox)" name="external" tool_tip="Standard-Browser für Hilfe, Weblinks usw. verwenden. Im Vollbildmodus nicht empfohlen."/>

+		<radio_item label="Integrierten Browser verwenden" name="internal" tool_tip="Integrierten Webbrowser verwenden, um die Hilfe, Weblinks usw. anzuzeigen. Dieser Browser öffnet als neues Fenster innerhalb von [APP_NAME]."/>

+		<radio_item label="Meinen Browser verwenden (IE, Firefox)" name="external" tool_tip="Standard Webbrowser des Systems verwenden, um die Hilfe, Weblinks usw. anzuzeigen. Bei Vollbildmodus nicht empfohlen."/>

 	</radio_group>

-	<check_box initial_value="false" label="Web-Proxy" name="web_proxy_enabled"/>

-	<line_editor name="web_proxy_editor" tool_tip="Name oder IP-Adresse des Proxys"/>

+	<check_box initial_value="false" label="Web Proxy" name="web_proxy_enabled"/>

+	<line_editor name="web_proxy_editor" tool_tip="Name oder IP Adresse des Proxyservers, den Sie benutzen möchten"/>

 	<button label="Durchsuchen" label_selected="Durchsuchen" name="set_proxy"/>

 	<text name="Proxy location">

-		Proxy-Standort

+		Proxyadresse

 	</text>

 </panel>

diff --git a/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml
index 54e512652e..6d541551b8 100644
--- a/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml
@@ -8,7 +8,7 @@
 	</string>

 	<layout_stack name="media_controls">

 		<layout_panel name="media_address">

-			<line_editor name="media_address_url" tool_tip="Medien-URL"/>

+			<line_editor name="media_address_url" tool_tip="Medien URL"/>

 			<layout_stack name="media_address_url_icons">

 				<layout_panel>

 					<icon name="media_whitelist_flag" tool_tip="Whitelist aktiviert"/>

@@ -19,7 +19,7 @@
 			</layout_stack>

 		</layout_panel>

 		<layout_panel name="media_play_position">

-			<slider_bar initial_value="0.5" name="media_play_slider" tool_tip="Fortschrittsbalken Filmwiedergabe"/>

+			<slider_bar initial_value="0.5" name="media_play_slider" tool_tip="Fortschritt der Filmwiedergabe"/>

 		</layout_panel>

 		<layout_panel name="media_volume">

 			<button name="media_volume_button" tool_tip="Dieses Medium stummschalten"/>

diff --git a/indra/newview/skins/default/xui/de/panel_teleport_history.xml b/indra/newview/skins/default/xui/de/panel_teleport_history.xml
index d4db27b841..cfab9283b9 100644
--- a/indra/newview/skins/default/xui/de/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/de/panel_teleport_history.xml
@@ -7,9 +7,9 @@
 		<accordion_tab name="3_days_ago" title="Vor 3 Tagen"/>

 		<accordion_tab name="4_days_ago" title="Vor 4 Tagen"/>

 		<accordion_tab name="5_days_ago" title="Vor 5 Tagen"/>

-		<accordion_tab name="6_days_and_older" title="6 Tage oder älter"/>

-		<accordion_tab name="1_month_and_older" title="1 Monat oder älter"/>

-		<accordion_tab name="6_months_and_older" title="6 Monate oder älter"/>

+		<accordion_tab name="6_days_and_older" title="6 Tage und älter"/>

+		<accordion_tab name="1_month_and_older" title="1 Monat und älter"/>

+		<accordion_tab name="6_months_and_older" title="6 Monate und älter"/>

 	</accordion>

 	<panel label="bottom_panel" name="bottom_panel"/>

 </panel>

diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency.xml b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
index eb25493adc..1ecb813dd1 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
@@ -52,6 +52,9 @@
 	<text name="total_amount">
 		[AMT] L$
 	</text>
+	<text name="currency_links">
+		[http://www.secondlife.com/my/account/payment_method_management.php?lang=es-ES payment method] | [http://www.secondlife.com/my/account/currency.php?lang=es-ES currency] | [http://www.secondlife.com/my/account/exchange_rates.php?lang=es-ES exchange rate]
+	</text>
 	<text name="purchase_warning_repurchase" right="-10">
 		Confirmando esta compra sólo compra la moneda.
 Tendrá que intentar de nuevo la operación.
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
index e6a49cbc6f..9a92c446f2 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
@@ -46,12 +46,12 @@
 		[AMT] L$

 	</text>

 	<text name="currency_links">

-		[http://www.secondlife.com/ payment method] | [http://www.secondlife.com/ currency] | [http://www.secondlife.com exchange rate]

+		[http://www.secondlife.com/my/account/payment_method_management.php?lang=fr-FR payment method] | [http://www.secondlife.com/my/account/currency.php?lang=fr-FR currency] | [http://www.secondlife.com/my/account/exchange_rates.php?lang=fr-FR exchange rate]

 	</text>

 	<text name="exchange_rate_note">

 		Saisissez à nouveau le montant pour voir le taux de change actuel.

 	</text>

-	<text bottom_delta="-64" height="48" name="purchase_warning_repurchase" right="-10">

+	<text name="purchase_warning_repurchase">

 		La confirmation de cet achat n&apos;achète que des L$, pas l&apos;objet.

 	</text>

 	<text bottom_delta="16" name="purchase_warning_notenough">

diff --git a/indra/newview/skins/default/xui/fr/floater_help_browser.xml b/indra/newview/skins/default/xui/fr/floater_help_browser.xml
index 0eb3ea3d21..20894d42fc 100644
--- a/indra/newview/skins/default/xui/fr/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/fr/floater_help_browser.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>

 <floater name="floater_help_browser" title="NAVIGATEUR D&apos;AIDE">

 	<floater.string name="home_page_url">

-		http://www.secondlife.com

+		http://fr.secondlife.com

 	</floater.string>

 	<floater.string name="support_page_url">

-		http://support.secondlife.com

+		http://fr.secondlife.com/support

 	</floater.string>

 	<layout_stack name="stack1">

 		<layout_panel name="external_controls">

diff --git a/indra/newview/skins/default/xui/it/floater_buy_currency.xml b/indra/newview/skins/default/xui/it/floater_buy_currency.xml
index a22850bc4b..8a59764251 100644
--- a/indra/newview/skins/default/xui/it/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_currency.xml
@@ -52,10 +52,11 @@
 	<text name="total_amount">
 		[AMT]L$
 	</text>
-	<text name="purchase_warning_repurchase" height="48" bottom_delta="-64" right="-10">
-		Confermando questa operazione si acquisterà solo
-la valuta. Per acquistare il bene, dovrai riprovare
-l&apos;operazione nuovamente.
+	<text name="currency_links">
+		[http://www.secondlife.com/my/account/payment_method_management.php?lang=it-IT payment method] | [http://www.secondlife.com/my/account/currency.php?lang=it-IT currency] | [http://www.secondlife.com/my/account/exchange_rates.php?lang=it-IT exchange rate]
+	</text>
+	<text name="purchase_warning_repurchase">
+		Confermando questa operazione si acquisterà solo la valuta. Per acquistare il bene, dovrai riprovare l&apos;operazione nuovamente.
 	</text>
 	<text name="purchase_warning_notenough" bottom_delta="16">
 		Non stai comprando abbastanza denaro.
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
index 03cd0f391a..9d49a38982 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
@@ -46,7 +46,7 @@
 		L$ [AMT]

 	</text>

 	<text name="currency_links">

-		[http://www.secondlife.com/ payment method] | [http://www.secondlife.com/ currency] | [http://www.secondlife.com exchange rate]

+		[http://www.secondlife.com/my/account/payment_method_management.php?lang=ja-JP payment method] | [http://www.secondlife.com/my/account/currency.php?lang=ja-JP currency] | [http://www.secondlife.com/my/account/exchange_rates.php?lang=ja-JP exchange rate]

 	</text>

 	<text name="exchange_rate_note">

 		金額を再入力して最新換算レートを確認します。

diff --git a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
index aac8438fdc..f17c069ecf 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
@@ -52,6 +52,9 @@
 	<text name="total_amount">
 		L$ [AMT]
 	</text>
+	<text name="currency_links">
+		[http://www.secondlife.com/my/account/payment_method_management.php?lang=pt-BR payment method] | [http://www.secondlife.com/my/account/currency.php?lang=pt-BR currency] | [http://www.secondlife.com/my/account/exchange_rates.php?lang=pt-BR exchange rate]
+	</text>
 	<text name="purchase_warning_repurchase">
 		Confirmando esta compra só compra a moeda.
 Você precisará tentar novamente a operação.
diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp
index ec612c4606..d7dd199722 100644
--- a/indra/newview/tests/llviewerhelputil_test.cpp
+++ b/indra/newview/tests/llviewerhelputil_test.cpp
@@ -78,9 +78,21 @@ static void substitute_string(std::string &input, const std::string &search, con
 	}
 }
 
+class LLAgent
+{
+public:
+	LLAgent() {}
+	~LLAgent() {}
+	BOOL isGodlike() const { return FALSE; }
+private:
+	int dummy;
+};
+LLAgent gAgent;
+
 std::string LLWeb::expandURLSubstitutions(const std::string &url,
 										  const LLSD &default_subs)
 {
+	(void)gAgent.isGodlike(); // ref symbol to stop compiler from stripping it
 	std::string new_url = url;
 	substitute_string(new_url, "[TOPIC]", default_subs["TOPIC"].asString());
 	substitute_string(new_url, "[VERSION]", gVersion);
@@ -91,6 +103,7 @@ std::string LLWeb::expandURLSubstitutions(const std::string &url,
 	return new_url;
 }
 
+
 //----------------------------------------------------------------------------
 	
 namespace tut