From dba05505ee0d5ad23cd7b2fab44271b3487b2712 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Mon, 22 Nov 2010 17:18:59 +0200
Subject: STORM-517 FIXED Warn user that language change will only take effect
 after restarting viewer.

The warning is shown only once (until the preferences floater is reopened).
---
 indra/newview/skins/default/xui/en/notifications.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 9536bf2cf7..60b876d163 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -907,6 +907,13 @@ Port settings take effect after you restart [APP_NAME].
 The new skin will appear after you restart [APP_NAME].
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="ChangeLanguage"
+   type="alertmodal">
+Changing language will take effect after you restart [APP_NAME].
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="GoToAuctionPage"
-- 
cgit v1.2.3


From daee0b0e850983b4b8d145ff81c9edcd9fa85bda Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Fri, 19 Nov 2010 23:20:40 +0200
Subject: STORM-456 FIXED Removed an extra space from a Polish string.

---
 indra/newview/skins/default/xui/pl/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 59daa26bf0..ea8bdd75b9 100644
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -3469,7 +3469,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE].
 		Rozmowa głosowa zakończona
 	</string>
 	<string name="conference-title-incoming">
-		Konferencja z  [AGENT_NAME]
+		Konferencja z [AGENT_NAME]
 	</string>
 	<string name="no_session_message">
 		(Sesja IM wygasła)
-- 
cgit v1.2.3


From b12a2d2fd9fc4aaaf45ef893c86fd1d5f6d37372 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Fri, 19 Nov 2010 21:16:01 +0200
Subject: STORM-432 FIXED Disabled manual resizing of the bottom panel in the
 People/Friends tab.

---
 indra/newview/skins/default/xui/en/panel_people.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 68c423d7dd..6a8bf87bc5 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -241,6 +241,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 				       height="25"
 				       layout="topleft"
 				       name="options_gear_btn_panel"
+				       user_resize="false"
 				       width="32">
 				          <menu_button
 				           follows="bottom|left"
@@ -261,6 +262,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 				       height="25"
 				       layout="topleft"
 				       name="add_btn_panel"
+				       user_resize="false"
 				       width="32">
 				          <button
 				           follows="bottom|left"
@@ -281,6 +283,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 				       height="25"
 				       layout="topleft"
 				       name="dummy_panel"
+				       user_resize="false"
 				       width="212">
 				          <icon
 				           follows="bottom|left|right"
@@ -297,6 +300,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 				       height="25"
 				       layout="topleft"
 				       name="trash_btn_panel"
+				       user_resize="false"
 				       width="31">
 				          <dnd_button
 				           follows="bottom|left"
-- 
cgit v1.2.3


From abf406e3d5f957d66618afaf02f54d0d686bda67 Mon Sep 17 00:00:00 2001
From: Wolfpup Lowenhar <wolfpup67@earthlink.net>
Date: Tue, 23 Nov 2010 20:55:18 -0500
Subject: STORM-674: corrected duplicate name tags in
 pannel_preferences_color.xml

---
 indra/newview/skins/default/xui/en/panel_preferences_colors.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index 6dc419a96c..0c75399764 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -317,7 +317,7 @@
    layout="topleft"
    left="30"
    height="12"
-   name="bubble_chat"
+   name="floater_opacity"
    top_pad="15"
    width="120"
    >
@@ -355,7 +355,7 @@
    left="50"
    max_val="1.00"
    min_val="0.00"
-   name="active"
+   name="inactive"
    show_text="true"
    top_pad="5"
    width="415" />
-- 
cgit v1.2.3