From 70e6b5a7f7027b7f9c005ca1ce43601f953dc951 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Sat, 26 Dec 2009 18:56:19 +0200
Subject: Fixed low bug EXT-3684 ("Default" icon is used always for group calls
 in the voice notifications instead of group icon) -- implemented
 LLGroupIconCtrl to show group icon for passed group UUID. -- added 
 LLGroupIconCtrl to incoming and outgoing dialogs

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_incoming_call.xml | 7 +++++++
 indra/newview/skins/default/xui/en/floater_outgoing_call.xml | 7 +++++++
 indra/newview/skins/default/xui/en/widgets/group_icon.xml    | 5 +++++
 3 files changed, 19 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/widgets/group_icon.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
index b9ce11600f..1d67123726 100644
--- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
@@ -43,6 +43,13 @@
      left_delta="19"
      top="35"
      width="36" />
+    <group_icon
+     enabled="false"
+     follows="left|top"
+     height="36"
+     layout="topleft"
+     top="35"
+     width="36" />
     <text
      clip_partial="true"
      font="SansSerifLarge"
diff --git a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
index 104ac2143f..eb772cc0bd 100644
--- a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
@@ -39,6 +39,13 @@
      left_delta="19"
      top="35"
      width="36" />
+    <group_icon
+     enabled="false"
+     follows="left|top"
+     height="36"
+     layout="topleft"
+     top="35"
+     width="36" />
     <text
      font="SansSerifLarge"
      height="20"
diff --git a/indra/newview/skins/default/xui/en/widgets/group_icon.xml b/indra/newview/skins/default/xui/en/widgets/group_icon.xml
new file mode 100644
index 0000000000..58d5e19fcc
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/group_icon.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<group_icon
+ default_icon_name="Generic_Group"
+ image_name="Generic_Group"
+ name="group_icon" />
-- 
cgit v1.2.3


From 1d7b1329da4e9abf5c73ebc91a27461759fce126 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Sat, 26 Dec 2009 19:19:06 +0200
Subject: Updated chiclet panel's parent min width, see changeset 556d071f6012.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 00eba94f47..1ade66f2dd 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -252,7 +252,7 @@
          top="0"
          name="chiclet_list_panel"
          width="189"
-         min_width="100"
+         min_width="110"
          user_resize="false"
          auto_resize="true">
 <!--*NOTE: min_width of the chiclet_panel (chiclet_list) must be the same
-- 
cgit v1.2.3


From f694d2fea26098a890b7e3148ffee83fcec773f5 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Mon, 28 Dec 2009 13:51:29 +0200
Subject: Fixed normal bug EXT-3374([BSI] Notifications and dialogs are
 semi-transparent (not opaque) even when in focus)

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index 707b24c92c..ba2d61afb7 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -14,7 +14,7 @@
  left="0"
  top="0"
  follows="right|bottom"
- bg_opaque_image="Toast_Background"
+ bg_opaque_image="Toast_Over"
  bg_alpha_image="Toast_Background"
  can_minimize="false"
  can_tear_off="false"
-- 
cgit v1.2.3


From 1474f3ae335c5286ad6254731dd6882a876e1bf8 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Mon, 28 Dec 2009 17:09:33 +0200
Subject: Fix for low bug EXT-3186 - Incorrect navigation as a result of using
 "Back" button in profile of resident.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index 63b7112c17..4565663bba 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -42,6 +42,7 @@
   >
     <panel_container
       name="panel_container"
+      default_panel_name="panel_people"
       width="333"
     >
       <panel
-- 
cgit v1.2.3


From b58cd620f776dd6d3da3e1c7e9a72d7b1170fabd Mon Sep 17 00:00:00 2001
From: Andrew Polunin <apolunin@productengine.com>
Date: Mon, 28 Dec 2009 18:11:46 +0200
Subject: fixed normal bug EXT-3713 Unable to edit busy mode responce

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_preferences_general.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 41bd7f3dcc..c98555735a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -329,10 +329,9 @@
       text_readonly_color="LabelDisabledColor"
       bg_writeable_color="LtGray"
       use_ellipses="false"
-      bg_visible="false"
-      border_visible="false"
+      bg_visible="true"
+      border_visible="true"
       hover="false"
-      text_color="LabelTextColor"
      commit_on_focus_lost = "true"
      follows="left|top"
      height="50"
-- 
cgit v1.2.3


From a395edd9a08406526a09dcda6e14d3d3c9542985 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Tue, 29 Dec 2009 17:00:41 +0200
Subject: (EXT-3356) Dock Voice control panel to Speak button chevron, not to
 middle of Speak button. - Renamed Speak button parts in XML to avoid widget
 names confusion.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/widgets/talk_button.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/widgets/talk_button.xml b/indra/newview/skins/default/xui/en/widgets/talk_button.xml
index 7781bdd066..68cf082c35 100644
--- a/indra/newview/skins/default/xui/en/widgets/talk_button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/talk_button.xml
@@ -11,14 +11,14 @@
                  image_unselected="SegmentedBtn_Left_Off"
 		 image_pressed="SegmentedBtn_Left_Selected_Press"
 		 image_pressed_selected="SegmentedBtn_Left_Selected_Press"
-    name="left"
+    name="speak_btn"
     label="Speak"
     label_selected="Speak"
     tab_stop="false"
     />
   <show_button
     follows="right" 
-    name="right"
+    name="speak_flyout_btn"
     label=""
     left="0"
     top="0"
-- 
cgit v1.2.3


From 88d8f86cccf277814ca2d12abfa5b8d3c0e73c12 Mon Sep 17 00:00:00 2001
From: Andrew Polunin <apolunin@productengine.com>
Date: Tue, 29 Dec 2009 17:40:55 +0200
Subject: fixed normal bug EXT-3731 Favorites Bar spaced too tightly fixed
 normal bug EXT-3696 Remove dropshadow from favorites bar text

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

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

diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
index 361f5a7bc8..dcf9847adb 100644
--- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml
+++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
@@ -3,6 +3,7 @@
 <!-- All buttons in the Favorites bar will be created from this one -->
 <button
  follows="left|bottom"
+ font_halign="center"
  halign="center"
  height="15"
  image_disabled="transparent.j2c"
@@ -14,10 +15,14 @@
  image_pressed="Favorite_Link_Over"
  image_pressed_selected="Favorite_Link_Over"
  hover_glow_amount="0.15"
+ label_shadow="false"
  layout="topleft"
  left="0"
  name="favorites_bar_btn"
+ pad_bottom="-1"
+ pad_left="11"
+ pad_right="7"
  tab_stop="false"
  top="0"
  use_ellipses="true"
- width="120" />
+ width="140" />
-- 
cgit v1.2.3


From b798a63d120dcfe4751d0bb56f6a2fcaafdd9966 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Tue, 29 Dec 2009 17:49:35 +0200
Subject: Fixed nice-to-have bug EXT-3706 - Redundant spacing in the voice
 controls panel.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 474b703ae5..47fd03b8f6 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -5,7 +5,7 @@
  can_close="false"
  height="270"
  layout="topleft"
- min_height="146"
+ min_height="122"
  min_width="190"
  name="floater_voice_controls"
  title="Voice Controls"
@@ -32,6 +32,10 @@
      name="no_one_near">
         No one near
     </string>
+    <string
+     name="max_visible_items">
+        5
+    </string>
     <panel
      bevel_style="out"
      border="true"
-- 
cgit v1.2.3


From 540b88bdeda72b4821675f6fbf53d01079792aea Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Tue, 29 Dec 2009 19:30:37 +0200
Subject: Fixed normal bug EXT-3694 - Fix to expandable text "more" widget
 caused horizontal scrollbars to appear again in Profiles. Reserved space for
 vertical scroll bar to avoid horizontal scroll bar.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_my_profile.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_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index d51893793c..10381d3987 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -37,7 +37,7 @@
      height="485"
      layout="topleft"
      name="profile_scroll"
-     reserve_scroll_corner="true"
+     reserve_scroll_corner="false"
      opaque="true"
      top="0"
      width="313">
@@ -48,7 +48,7 @@
          layout="topleft"
          top="0"
          left="0"
-         width="313">
+         width="297">
 	  <panel
          follows="left|top"
          height="117"
-- 
cgit v1.2.3


From 40e069057ee9af4c6bb5f39550aad565dce42735 Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Tue, 29 Dec 2009 20:10:34 +0200
Subject: fixed minor bug   EXT-3357 	 'Edit partner' link in Edit My
 Profile has larger clickable area than needed

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index bbf86089cb..be3c0bbd96 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -293,7 +293,7 @@
          right="-10"
          name="partner_edit_link"
          value="[[URL] Edit]"
-         width="150" />
+         width="50" />
         <panel
          follows="left|top|right"
          height="15"
-- 
cgit v1.2.3