From 6ed43b829b32b99b87cdd9b81e2ea3763fc49c56 Mon Sep 17 00:00:00 2001
From: Andrew Polunin <apolunin@productengine.com>
Date: Thu, 24 Dec 2009 13:46:43 +0200
Subject: fixed minor bug EXT-3459 (Not user friendly notification after
 leaving group while group chat is opened)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/strings.xml | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f004c95aca..447901f984 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2990,6 +2990,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="mute">
     Error while moderating.
   </string>
+  <!--Some times string name is getting from the body of server response.
+  For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post. 
+  In case of the EXT-3459 issue 'removed' is passed into the gIMMgr::showSessionStartError as a string name.
+  So, let add string with name="removed" with the same value as "removed_from_group" -->
+  <string name="removed">
+    You have been removed from the group.
+  </string>
   <string name="removed_from_group">
     You have been removed from the group.
   </string>
-- 
cgit v1.2.3


From d36e0604a4935a258713a5872b8439a017fcd0a0 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Thu, 24 Dec 2009 14:00:36 +0200
Subject: =?UTF-8?q?fixed=20EXT-3449=20=E2=80=9C"Close"=20and=20"Dock"=20ic?=
 =?UTF-8?q?ons=20overlap=20title=20of=20"Nearby"=20chat=20window,=20when?=
 =?UTF-8?q?=20it=20has=20minimal=20size=E2=80=9D,=20added=20minimal=20size?=
 =?UTF-8?q?=20attribute=20to=20the=20nearby=20chat=20floater;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_nearby_chat.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
index 58ba346e50..920f0c909a 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -16,6 +16,7 @@
  can_dock="true"
  bevel_style="in"
  height="300"
+ min_width="150"
  layout="topleft"
  name="nearby_chat"
  help_topic="nearby_chat"
-- 
cgit v1.2.3


From 15fb7171186413e0d5662c1af68fa9d6a9182b9a Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Thu, 24 Dec 2009 14:31:12 +0200
Subject: fixed normal bug EXT-3506   Snapshot button should appear pressed and
 green when snapshot floater is open

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_snapshot.xml | 1 +
 indra/newview/skins/default/xui/en/panel_bottomtray.xml | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index ec54522d3e..a36a1b591b 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -9,6 +9,7 @@
  name="Snapshot"
  help_topic="snapshot"
  save_rect="true"
+ save_visibility="true"
  title="SNAPSHOT PREVIEW"
  width="215">
     <floater.string
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 5ae808581d..448add1247 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -227,16 +227,20 @@
             <button
 			 follows="left|right"
              height="23"
+             image_selected="PushButton_Selected_Press"
+             image_pressed="PushButton_Press"
+             image_pressed_selected="PushButton_Selected_Press"
              left="0"
              label=""
              layout="topleft"
              name="snapshots"
              width="36"
              top="4"
+             is_toggle="true"
              image_overlay="Snapshot_Off"
              tool_tip="Take snapshot">
-				<button.commit_callback
-				 function="Floater.Toggle"
+				<button.init_callback
+				 function="Button.SetFloaterToggle"
 				 parameter="snapshot" />
 			</button>
 		</layout_panel>
-- 
cgit v1.2.3


From 6b984521c302067e806e9228cb6abb6c9a58a834 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 23 Dec 2009 12:18:20 -0800
Subject: DEV-44626 pressing 'enter' in world map search field does not
 initiate the search

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 169a0ea676..8904d4f49c 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -480,7 +480,10 @@
      name="location"
      select_on_focus="true"
      tool_tip="Type the name of a region"
-     width="152" />
+     width="152">
+               <search_editor.commit_callback
+                function="WMap.Location" />
+  </search_editor>
    <button
      follows="top|right"
      height="23"
-- 
cgit v1.2.3


From 84f52f9033f0459eb19b5ce8702c0c9397d09aec Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 23 Dec 2009 15:14:41 -0800
Subject: DEV-44634 statusbar global volume mute button should not take
 keyboard focus when clicked

---
 indra/newview/skins/default/xui/en/panel_status_bar.xml | 10 ----------
 1 file changed, 10 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 57b090e5b4..3578c4326d 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -80,16 +80,6 @@
      name="volume_btn"
      tool_tip="Global Volume Control"
      width="16" />
-    <panel
-     class="panel_volume_pulldown"
-     follows="all"
-     height="533"
-     layout="topleft"
-     left="0"
-     name="volume_pulldown"
-     top="5"
-     visible="false"
-     width="313" />
 
     <text
      enabled="true"
-- 
cgit v1.2.3


From ed4ee71889e2614235c9b65cc8807d4eada8836d Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 23 Dec 2009 15:38:10 -0800
Subject: DEV-44637 'debug gl', 'debug pipeline', 'fast alpha', 'animate
 textures' menu options all toggle at the same time, do not correspond to the
 correct underlying prefs

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 8f1799688b..3dae5008a0 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2481,30 +2481,30 @@
              name="Debug Pipeline">
                 <menu_item_check.on_check
                  function="CheckControl"
-                 parameter="RenderDebugGL" />
+                 parameter="RenderDebugPipeline" />
                 <menu_item_check.on_click
                  function="ToggleControl"
-                 parameter="RenderDebugGL" />
+                 parameter="RenderDebugPipeline" />
             </menu_item_check>
             <menu_item_check
              label="Fast Alpha"
              name="Fast Alpha">
                 <menu_item_check.on_check
                  function="CheckControl"
-                 parameter="RenderDebugGL" />
+                 parameter="RenderFastAlpha" />
                 <menu_item_check.on_click
                  function="ToggleControl"
-                 parameter="RenderDebugGL" />
+                 parameter="RenderFastAlpha" />
             </menu_item_check>
             <menu_item_check
              label="Animation Textures"
              name="Animation Textures">
                 <menu_item_check.on_check
                  function="CheckControl"
-                 parameter="RenderDebugGL" />
+                 parameter="AnimateTextures" />
                 <menu_item_check.on_click
                  function="ToggleControl"
-                 parameter="RenderDebugGL" />
+                 parameter="AnimateTextures" />
             </menu_item_check>
             <menu_item_check
              label="Disable Textures"
-- 
cgit v1.2.3


From b518a3a5f0d13a6dedfcd60918369076b48f5ece Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 23 Dec 2009 16:06:29 -0800
Subject: EXT-3532 Can't deactivate "Render Attached Lights" and "Render
 Attached Particles"

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 3dae5008a0..0640ae21de 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2555,7 +2555,7 @@
                  function="CheckControl"
                  parameter="RenderAttachedLights" />
                 <menu_item_check.on_click
-                 function="Advanced.HandleAttchedLightParticles"
+                 function="Advanced.HandleAttachedLightParticles"
                  parameter="RenderAttachedLights" />
             </menu_item_check>
             <menu_item_check
@@ -2565,7 +2565,7 @@
                  function="CheckControl"
                  parameter="RenderAttachedParticles" />
                 <menu_item_check.on_click
-                 function="Advanced.HandleAttchedLightParticles"
+                 function="Advanced.HandleAttachedLightParticles"
                  parameter="RenderAttachedParticles" />
             </menu_item_check>
             <menu_item_check
-- 
cgit v1.2.3


From d75ba371a2fbbd5af981168dffe86079357ef719 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Thu, 24 Dec 2009 14:24:09 +0200
Subject: Work on normal task EXT-3636 (Code Improvements: Voice control panels
 - Make Voice states and fade timeout xml driven) -- made Avatar List Item
 icon color xml-driven.

--HG--
branch : product-engine
---
 indra/newview/skins/default/colors.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

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

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 706245a479..cb511c2f0b 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -101,6 +101,24 @@
     <color
      name="AvatarNameColor"
      reference="White" />
+    <color
+     name="AvatarListItemIconDefaultColor"
+     reference="White" />
+    <color
+     name="AvatarListItemIconOnlineColor"
+     reference="White" />
+    <color
+     name="AvatarListItemIconOfflineColor"
+     value="0.5 0.5 0.5 0.5" />
+    <color
+     name="AvatarListItemIconVoiceInvitedColor"
+     reference="AvatarListItemIconOfflineColor" />
+    <color
+     name="AvatarListItemIconVoiceJoinedColor"
+     reference="AvatarListItemIconOnlineColor" />
+    <color
+     name="AvatarListItemIconVoiceLeftColor"
+     reference="AvatarListItemIconOfflineColor" />
     <color
      name="BackgroundChatColor"
      reference="DkGray_66" />
-- 
cgit v1.2.3