merge

--HG--
branch : product-engine

8 files changed, 11 insertions, 7 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f87cdbc43e..e5d72310cd 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4334,7 +4334,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>home</string>
+      <string>last</string>
     </map>
     <key>LoginPage</key>
     <map>
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 780393a9c0..224514dd48 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -985,7 +985,8 @@ void LLFloaterPreference::cleanupBadSetting()
 	if (gSavedPerAccountSettings.getString("BusyModeResponse2") == "|TOKEN COPY BusyModeResponse|")
 	{
 		llwarns << "cleaning old BusyModeResponse" << llendl;
-		gSavedPerAccountSettings.setString("BusyModeResponse2", gSavedPerAccountSettings.getText("BusyModeResponse"));
+		//LLTrans::getString("BusyModeResponseDefault") is used here for localization (EXT-5885)
+		gSavedPerAccountSettings.setString("BusyModeResponse2", LLTrans::getString("BusyModeResponseDefault"));
 	}
 }
 
diff --git a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml b/indra/newview/skins/default/xui/de/panel_im_control_panel.xml
index 0dca272633..abf8011d9d 100644
--- a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/de/panel_im_control_panel.xml
@@ -14,7 +14,7 @@
 		<layout_panel name="share_btn_panel">
 			<button label="Teilen" name="share_btn"/>
 		</layout_panel>
-		<layout_panel name="share_btn_panel">
+		<layout_panel name="pay_btn_panel">
 			<button label="Bezahlen" name="pay_btn"/>
 		</layout_panel>
 		<layout_panel name="call_btn_panel">
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index 28c4adf67c..88566ea037 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -111,7 +111,7 @@
          layout="topleft"
          min_height="25"
          width="100"
-         name="share_btn_panel"
+         name="pay_btn_panel"
          user_resize="false">
            <button
              auto_resize="true"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 455b4be264..2510d8b49f 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2104,6 +2104,9 @@ Clears (deletes) the media and all params from the given face.
 	<!-- panel contents -->
 	<string name="PanelContentsNewScript">New Script</string>
 
+  <!-- panel preferences general -->
+  <string name="BusyModeResponseDefault">The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed.  Your message will still be shown in their IM panel for later viewing.</string>
+
 	<!-- Mute -->
 	<string name="MuteByName">(by name)</string>
 	<string name="MuteAgent">(Resident)</string>
diff --git a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml
index 09969a796c..f218324d50 100644
--- a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml
@@ -13,7 +13,7 @@
 		<layout_panel name="share_btn_panel">
 			<button label="Compartir" name="share_btn"/>
 		</layout_panel>
-		<layout_panel name="share_btn_panel">
+		<layout_panel name="pay_btn_panel">
 			<button label="Pagar" name="pay_btn"/>
 		</layout_panel>
 		<layout_panel name="call_btn_panel">
diff --git a/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml
index 115e25e487..1f2169e22c 100644
--- a/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml
@@ -14,7 +14,7 @@
 		<layout_panel name="share_btn_panel">
 			<button label="Partager" name="share_btn"/>
 		</layout_panel>
-		<layout_panel name="share_btn_panel">
+		<layout_panel name="pay_btn_panel">
 			<button label="Payer" name="pay_btn"/>
 		</layout_panel>
 		<layout_panel name="call_btn_panel">
diff --git a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml
index be15e92aa1..f2429ac12a 100644
--- a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml
@@ -14,7 +14,7 @@
 		<layout_panel name="share_btn_panel">
 			<button label="共有" name="share_btn"/>
 		</layout_panel>
-		<layout_panel name="share_btn_panel">
+		<layout_panel name="pay_btn_panel">
 			<button label="支払う" name="pay_btn"/>
 		</layout_panel>
 		<layout_panel name="call_btn_panel">