From 11c72472bc54d8479ed03498106706703d0d6a8d Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Fri, 22 Jan 2010 12:51:13 +0200
Subject: fixed EXT-4529 [BSI] X in tabbed Instant Message functions as a
 minimize -

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 1d51d19a4a..bd25288a9e 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <multi_floater
- can_minimize="false"
+ can_close="false"  
+ can_minimize="true"
  can_resize="true"
  height="390"
  layout="topleft"
-- 
cgit v1.2.3


From 7fc94e79f09590de369b4a6c8d623bdb47d4cf14 Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Fri, 22 Jan 2010 14:15:05 +0200
Subject: fix for EXT-4540  [BSI] console flood & freeze on sorting group
 member listing by role & online status and few additional fixes...
 LLScrollListItem->getValue() doesn't contain LLUUID anymore also fix xml - no
 icons in Allowed Abilities

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_group_roles.xml     | 24 ++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 6b3fb04549..618d2f3b8e 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -49,6 +49,18 @@
 Select multiple Members by holding the Ctrl key and
 clicking on their names.
             </panel.string>
+            <panel.string
+             name="power_folder_icon">
+                Inv_FolderClosed
+            </panel.string>
+            <panel.string
+             name="power_all_have_icon">
+                Checkbox_On
+            </panel.string>
+            <panel.string
+             name="power_partial_icon">
+                Checkbox_Off
+            </panel.string>
          <filter_editor
          layout="topleft"
          top="5"
@@ -310,7 +322,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          width="285">
             Allowed Abilities
         </text>
-         <scroll_list
+        <scroll_list
          draw_stripes="true"
          height="90"
          layout="topleft"
@@ -320,10 +332,18 @@ things in this group. There&apos;s a broad variety of Abilities.
          tool_tip="For details of each allowed ability see the abilities tab"
          top_pad="0"
          width="300">
+            <scroll_list.columns
+             label=""
+             name="icon"
+             width="2" />
+            <scroll_list.columns
+             label=""
+             name="checkbox"
+             width="20" />
             <scroll_list.columns
              label=""
              name="action"
-             width="300" />
+             width="270" />
         </scroll_list>
     </panel>
     <panel
-- 
cgit v1.2.3


From a3f951fa468482235527b6ed995739bb03ee8d43 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Fri, 22 Jan 2010 13:58:53 +0200
Subject: Fixed low bug EXT-4596 - '99' number is displayed if there are more
 than 99 active notifications.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index de3de45718..38e9219b5b 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -418,7 +418,6 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
                name="Unread"
                image_overlay="Notices_Unread"
                image_overlay_alignment="center"
-               pad_right="15"
                tool_tip="Notifications"
                width="35" >
                   <button.init_callback
-- 
cgit v1.2.3


From ba3bbb2131f299f4a6bcef1fec72169e47d5717b Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Fri, 22 Jan 2010 18:06:53 +0200
Subject: Fixed bug EXT-4583 ([BSI] Changing group image via drag and drop from
 Inventory floater doesn't trigger "save" button to become active). Modified
 LLTextureCtrl's no_commit_on_selection paramater behavior so that the widget
 gets dirty only on DnD or when the OK button is pressed in the picker. This
 is needed for panels that rely on LLTextureCtrl::isDirty() to enable their
 "Apply" button.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 673052c3b5..0893c204e7 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -67,6 +67,7 @@ background_visible="true"
      layout="topleft"
      left="20"
      name="insignia"
+     no_commit_on_selection="true"
      tool_tip="Click to choose a picture"
      top_pad="5"
      width="100" />
-- 
cgit v1.2.3


From eaefaf7b33dba4326b0ef0e9b82edda2436ae581 Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Fri, 22 Jan 2010 18:27:17 +0200
Subject: fixed low bug EXT-4594   	 Highlight landmark on right mouse
 click in the Favorites Bar

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

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

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 6adf2a5950..b365040c20 100644
--- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml
+++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
@@ -10,6 +10,8 @@
  image_selected="transparent.j2c"
  image_unselected="transparent.j2c"
  image_pressed="Favorite_Link_Over"
+ image_hover_selected="Favorite_Link_Over"
+ image_hover_unselected="Favorite_Link_Over"
  hover_glow_amount="0.15"
  label_shadow="false"
  layout="topleft"
-- 
cgit v1.2.3


From ff852efdd21b814868c51411989c69fcdaa1eca1 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Fri, 22 Jan 2010 18:42:16 +0200
Subject: Fixed normal bug EXT-4497 - Edit Profile and Edit Appearance buttons
 layout issue in side panel.

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

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

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 34cde61252..4894ae01da 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="all"
- height="535"
+ height="500"
  label="Profile"
  layout="topleft"
  left="0"
@@ -41,7 +41,7 @@
      layout="topleft"
      left="0"
      top="0"
-     height="535"
+     height="480"
      width="313"
      border_size="0">
       <layout_panel
@@ -50,7 +50,7 @@
          layout="topleft"
          top="0"
          left="0"
-         height="505"
+         height="480"
          user_resize="false"
          width="313">
         <scroll_container
@@ -60,7 +60,7 @@
          left="0"
          name="profile_scroll"
          opaque="true"
-         height="505"
+         height="480"
          width="313"
          top="0">
           <panel
@@ -374,8 +374,9 @@
          follows="bottom|right"
          height="23"
          left="20"
-	 top="0"
+	 top="5"
          label="Edit Profile"
+         layout="topleft"
          name="edit_profile_btn"
          tool_tip="Edit your personal information"
          width="130" />
@@ -384,7 +385,9 @@
          height="23"
          label="Edit Appearance"
          left_pad="10"
+         layout="topleft"
          name="edit_appearance_btn"
+         top="5"
          tool_tip="Create/edit your appearance: physical data, clothes and etc."
          width="130" />
  </layout_panel>
-- 
cgit v1.2.3