From dff5b2f6ec027516a9c429b16af1f9fdc1c5bad8 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Wed, 6 Jan 2010 17:39:50 +0200
Subject: Decreased group/ad-hoc IM control panel width to 150 pixels
 (EXT-3790).

--HG--
branch : product-engine
---
 .../default/xui/en/panel_adhoc_control_panel.xml     | 17 +++++++++--------
 .../default/xui/en/panel_group_control_panel.xml     | 20 ++++++++++----------
 2 files changed, 19 insertions(+), 18 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
index 6c54532a3a..28a6995186 100644
--- a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
@@ -4,7 +4,7 @@
  follows="all"
  height="215"
  name="panel_im_control_panel"
- width="180">
+ width="150">
     <layout_stack
      mouse_opaque="false"
      border_size="0"
@@ -16,15 +16,16 @@
      name="vertical_stack"
      orientation="vertical"
      top="0"
-     width="177">
+     width="147">
         <layout_panel
          auto_resize="true"
          follows="top|left"
          height="130"
          layout="topleft"
+         left="0"
          min_height="0"
          mouse_opaque="false"
-         width="180"
+         width="147"
          top="0"
          name="speakers_list_panel"
          user_resize="false">
@@ -39,7 +40,7 @@
              show_info_btn="false"
              show_profile_btn="false"
              show_speaking_indicator="false"
-             width="180" />
+             width="147" />
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -47,7 +48,7 @@
          height="25"
          layout="topleft"
          min_height="25"
-         width="160"
+         width="130"
          name="call_btn_panel"
          user_resize="false"
          visible="false">
@@ -56,7 +57,7 @@
              height="20"
              label="Call"
              name="call_btn"
-             width="160"
+             width="130"
              top="5" />
         </layout_panel>
         <layout_panel
@@ -65,7 +66,7 @@
          height="25"
          layout="topleft"
          min_height="25"
-         width="160"
+         width="130"
          name="end_call_btn_panel"
          user_resize="false"
          visible="false">
@@ -82,7 +83,7 @@
          height="25"
          layout="topleft"
          min_height="25"
-         width="160"
+         width="130"
          name="voice_ctrls_btn_panel"
          user_resize="false"
          visible="false">
diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
index 4073ef158b..aa7d621e4c 100644
--- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
@@ -4,7 +4,7 @@
  follows="all"
  height="238"
  name="panel_im_control_panel"
- width="180">
+ width="150">
     <layout_stack
      mouse_opaque="false"
      border_size="0"
@@ -16,7 +16,7 @@
      name="vertical_stack"
      orientation="vertical"
      top="0"
-     width="175">
+     width="145">
         <layout_panel
          auto_resize="true"
          follows="top|left"
@@ -24,7 +24,7 @@
          layout="topleft"
          min_height="0"
          mouse_opaque="false"
-         width="180"
+         width="145"
          top="0"
          name="speakers_list_panel"
          user_resize="false">
@@ -39,7 +39,7 @@
              show_info_btn="false"
              show_profile_btn="false"
              show_speaking_indicator="false"
-             width="180" />
+             width="145" />
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -47,7 +47,7 @@
          height="28"
          layout="topleft"
          min_height="28"
-         width="160"
+         width="130"
          name="group_info_btn_panel"
          user_resize="false">
             <button
@@ -57,7 +57,7 @@
              name="group_info_btn"
              use_ellipses="true"
              top="5"
-             width="160" />
+             width="130" />
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -65,7 +65,7 @@
          height="28"
          layout="topleft"
          min_height="28"
-         width="160"
+         width="130"
          name="call_btn_panel"
          user_resize="false">
             <button
@@ -74,7 +74,7 @@
              label="Call Group"
              name="call_btn"
              use_ellipses="true" 
-             width="160" />
+             width="130" />
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -82,7 +82,7 @@
          height="28"
          layout="topleft"
          min_height="28"
-         width="160"
+         width="130"
          name="end_call_btn_panel"
          user_resize="false"
          visible="false">
@@ -99,7 +99,7 @@
          height="28"
          layout="topleft"
          min_height="28"
-         width="160"
+         width="130"
          name="voice_ctrls_btn_panel"
          user_resize="false"
          visible="false">
-- 
cgit v1.2.3


From 86b78d84bc95017fe3060bc1cca994858159ca7a Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Mon, 11 Jan 2010 13:59:32 +0200
Subject: added no_group_text string to the profile panel;

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 43947262ec..59400663b8 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -27,6 +27,9 @@
     <string
      name="no_partner_text"
      value="None" />
+    <string
+     name="no_group_text"
+     value="None" />
     <string
 	 name="RegisterDateFormat">
 	 [REG_DATE] ([AGE])
-- 
cgit v1.2.3


From 35f1b788f9d6b0d850598c43d998abcebb095509 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Mon, 11 Jan 2010 17:42:22 +0200
Subject: Fixed normal bug EXT - 3786 ("View profile" arrow widget in
 People/Friends list needs tooltip)

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index 45f9d9c7b6..4342318c22 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -98,6 +98,7 @@
      left_pad="5"
      right="-3"
      name="profile_btn"
+     tool_tip="View profile"
      top_delta="-2"
      width="20" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item.xml b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
index 5f6b911620..c243d08b97 100644
--- a/indra/newview/skins/default/xui/en/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
@@ -65,6 +65,7 @@
      left_pad="5"
      right="-3"
      name="profile_btn"
+     tool_tip="View profile"
      top_delta="-2"
      width="20" />
 </panel>
-- 
cgit v1.2.3


From 1bdae78926d11389ac6f4ca8daae3bf50ba7ceda Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 11 Jan 2010 18:39:15 +0200
Subject: Work on low task EXT-3456 (Code Improvements: Improve
 LLAvatarListItem to show/hide its buttons properly) Initial implementation: 
 * implemented common functionality to update Avatar List Item children
 positions & size (for name) depend on children visibility  * added its usage
 whereve visibility of child view is changed  * removed direct changing of
 "info button" visibility in Avatar List when Avatar List Item is added

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index 4342318c22..615ade99a2 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -58,13 +58,13 @@
      top="6"
      use_ellipses="true"
      value="Unknown"
-     width="182" />
+     width="180" />
     <text
      follows="right"
      font="SansSerifSmall"
      height="15"
      layout="topleft"
-     left_pad="8"
+     left_pad="5"
      name="last_interaction"
      text_color="LtGray_50"
      value="0s"
@@ -75,7 +75,7 @@
      draw_border="false"
      height="16"
      layout="topleft"
-     left_pad="0"
+     left_pad="5"
      mouse_opaque="true"
      name="speaking_indicator"
      visible="true"
-- 
cgit v1.2.3


From a452a4a6429bfc4404b07ea7e4ca33f336ec2546 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 11 Jan 2010 20:51:54 +0200
Subject: Fixed normal bug EXT-3984 (Bottom bar layout issues) * All buttons
 and controls need to move down 1 px (except chiclets, which are already
 vertically centered) * Left-hand controls need to shift left about 2 px
 (there should be 5 px of padding between the chat entry field and the edge of
 the window) * Right-hand controls (IM and notification buttons) also shift
 left so there is 5 px of padding against the right edge

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_bottomtray.xml      | 39 ++++++++--------------
 .../skins/default/xui/en/panel_nearby_chat_bar.xml |  4 +--
 2 files changed, 15 insertions(+), 28 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index aeaa049f1f..ca547a79e2 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -33,10 +33,10 @@
          height="10"
          image_name="spacer24.tga"
          layout="topleft"
-         min_width="4"
+         min_width="2"
          left="0"
          top="0"
-         width="4" />
+         width="2" />
         <layout_panel
  	mouse_opaque="false"
          auto_resize="false"
@@ -71,7 +71,7 @@
            layout="topleft"
            left="0"
            name="talk"
-           top="4"
+           top="5"
           width="100">
               <show_button>
                   <show_button.init_callback
@@ -110,7 +110,7 @@
           layout="topleft"
           name="Gesture"
           left="0"
-          top="4"
+          top="5"
           width="82"
           tool_tip="Shows/hides gestures">
              <gesture_combo_box.drop_down_button
@@ -153,7 +153,7 @@
              layout="topleft"
              name="movement_btn"
              tool_tip="Shows/hides movement controls"
-             top="4"
+             top="5"
              width="80">
                 <button.init_callback
                  function="Button.SetDockableFloaterToggle"
@@ -195,7 +195,7 @@
              layout="topleft"
              left="0"
              tool_tip="Shows/hides camera controls"
-             top="4"
+             top="5"
              name="camera_btn"
              width="80">
                 <button.init_callback
@@ -235,7 +235,7 @@
              layout="topleft"
              name="snapshots"
              width="36"
-             top="4"
+             top="5"
              is_toggle="true"
              image_overlay="Snapshot_Off"
              tool_tip="Take snapshot">
@@ -338,7 +338,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
              layout="topleft"
              left="0"
              name="im_well"
-             top="4"
+             top="5"
              width="35">
              <!--
 Emulate 4 states of button by background images, see details in EXT-3147. The same should be for notification_well button
@@ -362,8 +362,6 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
                  label_color="Black"
                  left="0"
                  name="Unread IM messages"
-                 pad_left="0"
-                 pad_right="0"
                  tool_tip="Conversations"
                  width="35" >
                     <button.init_callback
@@ -381,8 +379,8 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
          top="0"
          left_pad="3"
          name="notification_well_panel"
-         width="35"
-         min_width="35"
+         width="40"
+         min_width="40"
          user_resize="false">
             <chiclet_notification
              flash_period="0.25"
@@ -392,7 +390,7 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
              left="0"
              max_displayed_count="99"
              name="notification_well"
-             top="4"
+             top="5"
              width="35">
               <button
                  bottom_pad="3"
@@ -405,11 +403,11 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
                follows="right"
                flash_color="ChicletFlashColor"
                 label_color="Black"
-               left="5"
+               left="0"
                name="Unread"
                image_overlay="Notices_Unread"
                image_overlay_alignment="center"
-               pad_right="5"
+               pad_right="15"
                tool_tip="Notifications"
                width="35" >
                   <button.init_callback
@@ -418,16 +416,5 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
               </button>
 	    </chiclet_notification>
         </layout_panel>
-        <icon
-         auto_resize="false"
-         color="0 0 0 0"
-         follows="left|right"
-         height="10"
-         image_name="spacer24.tga"
-         layout="topleft"
-         min_width="4"
-         right="-1"
-         top="0"
-         width="4"/>
     </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
index f09a0e03ed..2b361c0628 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -27,7 +27,7 @@
      max_length="512"
      name="chat_box"
      tool_tip="Press Enter to say, Ctrl+Enter to shout"
-     top="1"
+     top="2"
      width="283" />
     <output_monitor
      auto_update="true"
@@ -45,7 +45,7 @@
      follows="right"
      is_toggle="true"
      width="20"
-     top="1"
+     top="2"
      layout="topleft"
      left_pad="4"
      image_disabled="ComboButton_UpOff"
-- 
cgit v1.2.3


From ba320f7ca4957d7a8444df95211711a07055d2e1 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Tue, 12 Jan 2010 13:24:33 +0200
Subject: Fix for major bug EXT-4147 - Cannot click on Urls in
 LLExpandableTextBox objects.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_my_profile.xml | 11 ++++++-----
 indra/newview/skins/default/xui/en/panel_profile.xml    |  9 +++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

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

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 8327edfdd0..5a023dab97 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -62,10 +62,11 @@
           <panel
                 layout="topleft"
           follows="left|top|right"
+                height="505"
                name="scroll_content_panel"
                 top="0"
                 left="0"
-                width="303">
+                width="297">
             <panel
                   follows="left|top|right"
                   height="117"
@@ -73,7 +74,7 @@
                   left="10"
                   name="second_life_image_panel"
                   top="0"
-                  width="300">
+                  width="297">
               <texture_picker
                allow_no_texture="true"
                default_image_name="None"
@@ -114,7 +115,7 @@
                textbox.max_length="512"
                name="sl_description_edit"
                top_pad="-3"
-               width="188"
+               width="181"
                expanded_bg_visible="true"
                expanded_bg_color="DkGray">
                 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
@@ -127,7 +128,7 @@
        top_pad="10"
              left="10"
              name="first_life_image_panel"
-             width="300">
+             width="297">
               <texture_picker
                allow_no_texture="true"
                default_image_name="None"
@@ -167,7 +168,7 @@
                textbox.max_length="512"
                name="fl_description_edit"
                top_pad="-3"
-               width="188"
+               width="181"
                expanded_bg_visible="true"
                expanded_bg_color="DkGray">
                 Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 59400663b8..4c4b2b10a0 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -65,10 +65,11 @@
           <panel
                 layout="topleft"
           follows="left|top|right"
+                height="505"
                 name="profile_scroll_panel"
                 top="0"
                 left="0"
-                width="303">
+                width="297">
             <panel
                   follows="left|top|right"
                   height="117"
@@ -76,7 +77,7 @@
                   left="10"
                   name="second_life_image_panel"
                   top="0"
-                  width="303">
+                  width="297">
               <texture_picker
                allow_no_texture="true"
                default_image_name="None"
@@ -120,7 +121,7 @@
        top_pad="10"
              left="10"
              name="first_life_image_panel"
-             width="303">
+             width="297">
               <texture_picker
                allow_no_texture="true"
                default_image_name="None"
@@ -272,7 +273,7 @@
             left="7"
             name="sl_groups"
             top_pad="0"
-            width="298"
+            width="290"
             expanded_bg_visible="true"
             expanded_bg_color="DkGray">
               Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm.
-- 
cgit v1.2.3


From 85467c0ba654e2a787b216b89807e10fe1b078d8 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Tue, 12 Jan 2010 17:27:36 +0200
Subject: Fixed major bug EXT-4121 ([BSI] Partner display is blank for
 residents on your friends list, on the first lookup after login)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_edit_profile.xml | 3 +--
 indra/newview/skins/default/xui/en/panel_my_profile.xml   | 3 +--
 indra/newview/skins/default/xui/en/panel_profile.xml      | 5 ++---
 3 files changed, 4 insertions(+), 7 deletions(-)

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

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 be3c0bbd96..172cf18fc4 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -301,14 +301,13 @@
          left="10"
          name="partner_data_panel"
          width="285">
-            <text
+            <name_box
              follows="left|top|right"
              height="30"
              layout="topleft"
              left="0"
              name="partner_text"
              top="0"
-             value="[FIRST] [LAST]"
              width="285"
              word_wrap="true" />
          </panel>
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 5a023dab97..b8b9384462 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -261,14 +261,13 @@
              name="partner_data_panel"
              top_pad="0"
              width="300">
-              <text
+              <name_box
                follows="left|top"
                height="10"
                layout="topleft"
                left="0"
                name="partner_text"
                top="0"
-               value="[FIRST] [LAST]"
            width="300"
                word_wrap="true" />
             </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 4c4b2b10a0..ec697838f6 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -244,14 +244,13 @@
              name="partner_data_panel"
              top_pad="0"
              width="300">
-              <text
+              <name_box
                follows="left|top"
                height="10"
                layout="topleft"
                left="0"
                name="partner_text"
                top="0"
-               value="[FIRST] [LAST]"
            width="300"
                word_wrap="true" />
             </panel>
@@ -379,4 +378,4 @@
         </layout_panel>
     
 </layout_stack>
-</panel>
\ No newline at end of file
+</panel>
-- 
cgit v1.2.3


From f0bbe788370bdc4a4479899be620e2d298d0be70 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Tue, 12 Jan 2010 18:33:43 +0200
Subject: added missing no_group_text string constant to panel_my_profile.xml

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

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

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 b8b9384462..038d48cdd6 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -27,6 +27,9 @@
     <string
      name="no_partner_text"
      value="None" />
+    <string
+     name="no_group_text"
+     value="None" />
     <string
 	 name="RegisterDateFormat">
 	 [REG_DATE] ([AGE])
-- 
cgit v1.2.3


From 1f5e82e14023268a2d1b3076a6e788e37b2ddfdc Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Tue, 12 Jan 2010 20:01:10 +0200
Subject: Partially fixed major bug EXT-4112 ([BSI] Number of groups not
 limited to 25). Viewer now disallows joining or creating groups if the limit
 reached. A server-side fix is also needed.

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

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 410c398ea5..b4ce0df6a2 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2915,6 +2915,16 @@ You have reached your maximum number of groups. Please leave another group befor
      yestext="Join"/>
   </notification>
 
+  <notification
+   icon="alert.tga"
+   name="JoinedTooManyGroups"
+   type="alert">
+You have reached your maximum number of groups. Please leave some group before joining or creating a new one.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification
    icon="alert.tga"
    name="KickUser"
-- 
cgit v1.2.3


From 891f2b3a753a6f1526e8591c043a9d9280ae6612 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Wed, 13 Jan 2010 14:55:42 +0200
Subject: Fixed normal bug EXT - 4047 (No verb/action buttons at bottom of
 Group profile panel)

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_group_info_sidetray.xml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

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

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 c0db734f8c..8188048821 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
@@ -216,12 +216,28 @@ background_visible="true"
      visible="false"
      width="65" />-->
      <button
+     follows="bottom|right"          
+     label="Group Chat"
+     name="btn_chat"
+     right="-184"
+     left_pad="2"     
+     height="22"          
+     width="85" />
+     <button
+     follows="bottom|right"          
+     label="Group Call"
+     name="btn_call"
+     right="-97"
+     left_pad="2"     
+     height="22"          
+     width="85" />
+     <button
      height="22"
      label="Save"
      label_selected="Save"
      name="btn_apply"
      left_pad="10"
      right="-10"
-     width="100" />
+     width="85" />
      </panel>
 </panel>
\ No newline at end of file
-- 
cgit v1.2.3


From 33af1ba1e5beb452a9916c99411f72cc5d33fe46 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Wed, 13 Jan 2010 17:40:47 +0200
Subject: =?UTF-8?q?implemented=20EXT-4001=20=E2=80=9CNotification=20Well?=
 =?UTF-8?q?=20window=20interaction=E2=80=9D,=20made=20notification=20that?=
 =?UTF-8?q?=20restored=20from=20notification=20well=20window=20shows=20as?=
 =?UTF-8?q?=20inspector;?=
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/inspect_toast.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/inspect_toast.xml

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

diff --git a/indra/newview/skins/default/xui/en/inspect_toast.xml b/indra/newview/skins/default/xui/en/inspect_toast.xml
new file mode 100644
index 0000000000..0221397a8c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/inspect_toast.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater
+ legacy_header_height="25"
+ bevel_style="in"
+ bg_opaque_image="Inspector_Background"
+ can_close="false"
+ can_minimize="false"
+ height="148"
+ layout="topleft"
+ name="inspect_toast"
+ single_instance="true"
+ sound_flags="0"
+ visible="true"
+ width="228">
+</floater>
-- 
cgit v1.2.3


From 70de93ce10528595012a43aa9c68633069e5406e Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Wed, 13 Jan 2010 19:36:23 +0200
Subject: fix for normal EXT-4139 Group Abilities: No distinction between
 abilities and categories of ability

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

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

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 a5bab3232c..6b3fb04549 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -210,6 +210,18 @@ including the Everyone and Owner Roles.
                 Abilities allow Members in Roles to do specific
 things in this group. There&apos;s a broad variety of Abilities.
             </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"
@@ -220,23 +232,32 @@ things in this group. There&apos;s a broad variety of Abilities.
          max_length="250"
          label="Filter Abilities"
          name="filter_input" />
-            <scroll_list
-             column_padding="0"
-             draw_stripes="false"
-             follows="left|top"
-             height="200"
-             layout="topleft"
-             left="0"
-             multi_select="true"
-             name="action_list"
-             search_column="1"
-             tool_tip="Select an Ability to view more details"
-             top_pad="5"
-             width="300">
-                <scroll_list.columns
-                 name="action"
-                 width="300" />
-            </scroll_list>
+
+        <scroll_list
+         column_padding="0"
+         draw_stripes="true"
+         height="200"
+         follows="left|top"
+         layout="topleft"
+         left="0"
+         name="action_list"
+         search_column="2"
+         tool_tip="Select an Ability to view more details"
+         top_pad="5"
+         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="270" />
+        </scroll_list>
         </panel>
     </tab_container>
     <panel
-- 
cgit v1.2.3


From 6ad8674a8c5a87f438aa5ad6230396a859ba268e Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Wed, 13 Jan 2010 19:49:51 +0200
Subject: Fixed bug EXT-4210 (Partner in Profile not a Link). Added an optional
 "link" parameter to LLNameBox to display the name as a link.

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

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

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 038d48cdd6..a9ff9362a0 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -269,6 +269,7 @@
                height="10"
                layout="topleft"
                left="0"
+               link="true"
                name="partner_text"
                top="0"
            width="300"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index ec697838f6..2cd8940014 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -249,6 +249,7 @@
                height="10"
                layout="topleft"
                left="0"
+               link="true"
                name="partner_text"
                top="0"
            width="300"
-- 
cgit v1.2.3