From 7ad64438430de9a26d2c7c790eb196db4817f259 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Wed, 4 Nov 2009 13:45:27 +0200
Subject: Implemented normal sub-task EXT-2145 (Incorrect names of Call button
 on IM Control Panels)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml | 4 ++--
 indra/newview/skins/default/xui/en/panel_group_control_panel.xml | 4 ++--
 indra/newview/skins/default/xui/en/panel_im_control_panel.xml    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

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

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 87c4e2787f..0c1e777fa1 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
@@ -19,13 +19,13 @@
      width="180" />
     <button
      name="call_btn"
-     label="Call"
+     label="Call Group"
      left_delta="27"
      width="125"
      height="20" />
     <button
      name="end_call_btn"
-     label="End Call"
+     label="Leave Call"
      width="125"
      height="20" 
      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 3358015335..560d353d00 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
@@ -25,12 +25,12 @@
      height="20" />
     <button
      name="call_btn"
-     label="Call"
+     label="Call Group"
      width="125"
      height="20" />
     <button
      name="end_call_btn"
-     label="End Call"
+     label="Leave Call"
      width="125"
      height="20" 
      visible="false"/>
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index 0dd3878426..7308ca3c29 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -31,7 +31,7 @@
     <button
      follows="left|bottom"
      height="20"
-     label="End Call"
+     label="Leave Call"
      name="end_call_btn"
      visible="false"
      width="125" />
-- 
cgit v1.2.3


From 8bd0c9058d3d24218cf59dd01f152b41240853a4 Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Wed, 4 Nov 2009 14:25:41 +0200
Subject: fix for some group_info bugs. EXT-1091 "Refresh" button is overlapped
 by "Cancel" button in "Group Profile" panel

--HG--
branch : product-engine
---
 .../default/xui/en/panel_group_info_sidetray.xml     | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(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 132c031942..7e24ad2c94 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
@@ -128,15 +128,16 @@ background_visible="true"
              <accordion_tab
                  can_resize="false"
                  layout="topleft"
-                 name="tab_general"
+                 name="group_general_tab"
                  title="General">
         <panel
         border="false"
+         class="panel_group_general" 
          filename="panel_group_general.xml"
          layout="topleft"
          left="0"
          help_topic="group_general_tab"
-         name="general_tab"
+         name="group_general_tab_panel"
          top="0"
          width="333" />
          </accordion_tab>
@@ -144,15 +145,16 @@ background_visible="true"
                  can_resize="false"
                  expanded="false"
                  layout="topleft"
-                 name="tab_roles"
+                 name="group_roles_tab"
                  title="Roles">
         <panel
         border="false"
+         class="panel_group_roles"
          filename="panel_group_roles.xml"
          layout="topleft"
          left="0"
          help_topic="group_roles_tab"
-         name="roles_tab"
+         name="group_roles_tab_panel"
          top="0"
          width="333" />
          </accordion_tab>
@@ -160,14 +162,15 @@ background_visible="true"
                  can_resize="false"
                  expanded="false"
                  layout="topleft"
-                 name="tab_notices"
+                 name="group_notices_tab"
                  title="Notices">
         <panel
+         class="panel_group_notices"
          filename="panel_group_notices.xml"
          layout="topleft"
          left="0"
          help_topic="group_notices_tab"
-         name="notices_tab"
+         name="group_notices_tab_panel"
          top="0"
          width="333" />
          </accordion_tab>
@@ -175,15 +178,16 @@ background_visible="true"
                  can_resize="false"
                  expanded="false"
                  layout="topleft"
-                 name="tab_notices"
+                 name="group_land_tab"
                  title="Land/Assets">
         <panel
         border="false"
+         class="panel_group_land_money"
          filename="panel_group_land_money.xml"
          layout="topleft"
          left="0"
          help_topic="group_land_money_tab"
-         name="land_money_tab"
+         name="group_land_tab_panel"
          top="0"
          width="333" />
          </accordion_tab>
-- 
cgit v1.2.3


From 2715e94a5ae969956f493609561f0cc144ec2c37 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Wed, 4 Nov 2009 14:33:00 +0200
Subject: Implemented major task EXT-2054 "Hook up parcel permission icons to
 parcel profile": - Added icon representation of parcel permissions to Place
 Profile panel.

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_place_profile.xml   | 116 ++-------------------
 1 file changed, 10 insertions(+), 106 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index 7e073f064d..4dc65fa736 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -289,33 +289,14 @@
                          left="0"
                          top="0"
                          width="275">
-                            <icon
-                             follows="top|left"
-                             height="16"
-                             image_name="parcel_drk_M"
-                             layout="topleft"
-                             left="20"
-                             name="icon_M"
-                             top="0"
-                             width="18" />
-                            <icon
-                             follows="top|left"
-                             height="16"
-                             image_name="parcel_drk_R"
-                             layout="topleft"
-                             left="20"
-                             name="icon_R"
-                             top="0"
-                             width="18" />
                             <icon
                              follows="top|left"
                              height="16"
                              image_name="parcel_drk_PG"
                              layout="topleft"
                              left="20"
-                             name="icon_PG"
+                             name="rating_icon"
                              top="0"
-                             visible="false"
                              width="18" />
                             <text
                              follows="left|top"
@@ -332,7 +313,7 @@
                              left_pad="0"
                              name="rating_value"
                              top_delta="0"
-                             value="Mature"
+                             value="unknown"
                              width="120" />
                             <icon
                              follows="top|left"
@@ -340,19 +321,9 @@
                              image_name="parcel_drk_Voice"
                              layout="topleft"
                              left="20"
-                             name="icon_Voice"
+                             name="voice_icon"
                              top_pad="5"
                              width="22" />
-                            <icon
-                             follows="top|left"
-                             height="18"
-                             image_name="parcel_drk_VoiceNo"
-                             layout="topleft"
-                             left="20"
-                             name="icon_VoiceNo"
-                             top_delta="0"
-                             visible="false"
-                             width="22" />
                             <text
                              follows="left|top"
                              height="18"
@@ -377,19 +348,9 @@
                              image_name="parcel_drk_Fly"
                              layout="topleft"
                              left="20"
-                             name="icon_Fly"
+                             name="fly_icon"
                              top_pad="3"
                              width="22" />
-                            <icon
-                             follows="top|left"
-                             height="18"
-                             image_name="parcel_drk_FlyNo"
-                             layout="topleft"
-                             left="20"
-                             name="icon_FlyNo"
-                             top_delta="0"
-                             visible="false"
-                             width="22" />
                             <text
                              follows="left|top"
                              height="16"
@@ -413,18 +374,8 @@
                              image_name="parcel_drk_Push"
                              layout="topleft"
                              left="20"
-                             name="icon_Push"
+                             name="push_icon"
                              top_pad="3"
-                             visible="false"
-                             width="22" />
-                            <icon
-                             follows="top|left"
-                             height="18"
-                             image_name="parcel_drk_PushNo"
-                             layout="topleft"
-                             left="20"
-                             name="icon_PushNo"
-                             top_delta="0"
                              width="22" />
                             <text
                              follows="left|top"
@@ -449,18 +400,9 @@
                              image_name="parcel_drk_Build"
                              layout="topleft"
                              left="20"
-                             name="icon_Build"
+                             name="build_icon"
                              top_pad="3"
                              width="22" />
-                            <icon
-                             follows="top|left"
-                             height="18"
-                             image_name="parcel_drk_BuildNo"
-                             layout="topleft"
-                             left="20"
-                             name="icon_BuildNo"
-                             top_delta="0"
-                             visible="false" />
                             <text
                              follows="left|top"
                              height="14"
@@ -484,18 +426,9 @@
                              image_name="parcel_drk_Scripts"
                              layout="topleft"
                              left="20"
-                             name="icon_Scripts"
+                             name="scripts_icon"
                              top_pad="3"
                              width="22" />
-                            <icon
-                             follows="top|left"
-                             height="18"
-                             image_name="parcel_drk_ScriptsNo"
-                             layout="topleft"
-                             left="20"
-                             name="icon_ScriptsNo"
-                             top_delta="0"
-                             visible="false" />
                             <text
                              follows="left|top"
                              height="14"
@@ -519,18 +452,9 @@
                              image_name="parcel_drk_Damage"
                              layout="topleft"
                              left="20"
-                             name="icon_Damage"
+                             name="damage_icon"
                              top_pad="7"
-                             visible="false"
                              width="22" />
-                            <icon
-                             follows="top|left"
-                             height="18"
-                             image_name="parcel_drk_DamageNo"
-                             layout="topleft"
-                             left="20"
-                             name="icon_DamageNo"
-                             top_delta="0" />
                             <text
                              follows="left|top"
                              height="14"
@@ -622,33 +546,13 @@
                          top_pad="7"
                          value="Rating:"
                          width="80" />
-                        <icon
-                         follows="top|left"
-                         height="16"
-                         image_name="parcel_drk_M"
-                         layout="topleft"
-                         left_pad="0"
-                         name="icon_M"
-                         width="18" />
-                        <icon
-                         follows="top|left"
-                         height="16"
-                         image_name="parcel_drk_R"
-                         layout="topleft"
-                         left_delta="0"
-                         name="icon_R"
-                         top_delta="0"
-                         visible="false"
-                         width="18" />
                         <icon
                          follows="top|left"
                          height="16"
                          image_name="parcel_drk_PG"
                          layout="topleft"
-                         left_delta="0"
-                         name="icon_PG"
-                         top_delta="0"
-                         visible="false"
+                         left_pad="0"
+                         name="region_rating_icon"
                          width="18" />
                         <text
                          follows="left|top|right"
-- 
cgit v1.2.3


From e634f2f42d5a7165f4cab2910f144144bc7a31d0 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Wed, 4 Nov 2009 16:13:47 +0200
Subject: Fixed problems caused by a160d0dfb897

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 4175d21639..a289ce3cf7 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -11,7 +11,7 @@
 	<icon
 	 follows="all"
 	 image_name="NavBar_BG"
-	 mouse_opaque="true"
+	 mouse_opaque="false"
 	 name="bg_icon"
 	 scale_image="true"
 	 visible="true"
-- 
cgit v1.2.3


From a1e7bef9e70312929b6c1b437a17954e6198c1db Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Wed, 4 Nov 2009 17:48:27 +0200
Subject: No ticket,has sorted xml attributes in alphabetical order.

--HG--
branch : product-engine
---
 .../default/xui/en/panel_adhoc_control_panel.xml   |  35 ++++----
 .../default/xui/en/panel_group_control_panel.xml   |  44 +++++----
 .../default/xui/en/panel_im_control_panel.xml      | 100 +++++++++++----------
 3 files changed, 100 insertions(+), 79 deletions(-)

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

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 0c1e777fa1..8dbcfe6360 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
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- name="panel_im_control_panel"
- width="180"
+ border="false"
  height="215"
- border="false">
+ name="panel_im_control_panel"
+ width="180">
+
     <avatar_list
      color="DkGray2"
      follows="left|top|right|bottom"
@@ -16,24 +17,28 @@
      show_info_btn="false"
      show_profile_btn="false"
      top="10"
-     width="180" />
+     width="180"/>
+
     <button
-     name="call_btn"
+     height="20"
      label="Call Group"
      left_delta="27"
-     width="125"
-     height="20" />
+     name="call_btn"
+     width="125"/>
+
     <button
-     name="end_call_btn"
+     height="20"
      label="Leave Call"
-     width="125"
-     height="20" 
-     visible="false"/>
+     name="end_call_btn"
+     visible="false"
+     width="125"/>
+
     <button
      enabled="false"
-     name="voice_ctrls_btn"
-     label="Open Voice Controls"
-     width="125"
      height="20"
-     visible="false"/>
+     label="Open Voice Controls"
+     name="voice_ctrls_btn"
+     visible="false"
+     width="125"/>
+
 </panel>
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 560d353d00..737bb5bcb6 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
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- name="panel_im_control_panel"
- width="180"
+ border="false"
  height="238"
- border="false">
+ name="panel_im_control_panel"
+ width="180">
+
     <avatar_list
      color="DkGray2"
      follows="left|top|right|bottom"
@@ -16,29 +17,34 @@
      show_info_btn="false"
      show_profile_btn="false"
      top="10"
-     width="180" />
+     width="180"/>
+
     <button
-     name="group_info_btn"
+     height="20"
      label="Group Info"
      left_delta="27"
-     width="125"
-     height="20" />
+     name="group_info_btn"
+     width="125"/>
+
     <button
-     name="call_btn"
+     height="20"
      label="Call Group"
-     width="125"
-     height="20" />
+     name="call_btn"
+     width="125"/>
+
     <button
-     name="end_call_btn"
+     height="20"
      label="Leave Call"
-     width="125"
-     height="20" 
-     visible="false"/>
+     name="end_call_btn"
+     visible="false"
+     width="125"/>
+
     <button
-	 enabled="false"
-     name="voice_ctrls_btn"
-     label="Open Voice Controls"
-     width="125"
+     enabled="false"
      height="20"
-     visible="false"/>
+     label="Open Voice Controls"
+     name="voice_ctrls_btn"
+     visible="false"
+     width="125"/>
+
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index 7308ca3c29..35be31983c 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -1,32 +1,37 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="panel_im_control_panel"
-       width="128"
-       height="327"
-       border="false">
+<panel
+ border="false"
+ height="327"
+ name="panel_im_control_panel"
+ width="128">
 
-  <avatar_icon name="avatar_icon"
-               follows="left|top"
-               left_delta="3"
-               width="125"
-               height="125" />
+    <avatar_icon
+     follows="left|top"
+     height="125"
+     left_delta="3"
+     name="avatar_icon"
+     width="125"/>
 
-  <button name="view_profile_btn"
-          follows="left|bottom"
-          label="View Profile"
-          width="125"
-		  height="20" />
+    <button
+     follows="left|bottom"
+     height="20"
+     label="View Profile"
+     name="view_profile_btn"
+     width="125"/>
 
-  <button name="add_friend_btn"
-          follows="left|bottom"
-          label="Add Friend"
-          width="125"
-          height="20" />
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Add Friend"
+     name="add_friend_btn"
+     width="125"/>
 
-  <button name="call_btn"
-          follows="left|bottom"
-          label="Call"
-          width="125"
-          height="20" />
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Call"
+     name="call_btn"
+     width="125"/>
 
     <button
      follows="left|bottom"
@@ -34,31 +39,36 @@
      label="Leave Call"
      name="end_call_btn"
      visible="false"
-     width="125" />
+     width="125"/>
 
-  <button
-	 enabled="false"
+    <button
+     enabled="false"
      follows="left|bottom"
-     name="voice_ctrls_btn"
+     height="20"
      label="Open Voice Controls"
-     width="125"
+     name="voice_ctrls_btn"
+     visible="false"
+     width="125"/>
+
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Teleport"
+     name="teleport_btn"
+     width="125"/>
+
+    <button
+     follows="left|bottom"
      height="20"
-     visible="false"/>
+     label="Share"
+     name="share_btn"
+     width="125"/>
 
-  <button name="teleport_btn"
-          follows="left|bottom"
-          label="Teleport"
-          width="125"
-          height="20" />
-  <button name="share_btn"
-          follows="left|bottom"
-          label="Share"
-          width="125"
-          height="20" />
-  <button name="pay_btn"
-          follows="left|bottom"
-          label="Pay"
-          width="125"
-          height="20" />
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Pay"
+     name="pay_btn"
+     width="125"/>
 
 </panel>
-- 
cgit v1.2.3


From 0fd7ff59f58dc9c5d9b043830d513020ac7a6cdd Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Wed, 4 Nov 2009 18:19:32 +0200
Subject: Implemented normal sub-task EXT-2142 (Call, End Call and Oen Voice
 Controls buttons should be located on their own panel at the bottom of the
 control panel (all types of IMs))

--HG--
branch : product-engine
---
 .../skins/default/xui/en/floater_im_session.xml    |  10 +-
 .../default/xui/en/panel_adhoc_control_panel.xml   |  51 +++++----
 .../default/xui/en/panel_group_control_panel.xml   |  60 ++++++-----
 .../default/xui/en/panel_im_control_panel.xml      | 117 ++++++++++++---------
 4 files changed, 139 insertions(+), 99 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 88aca005cf..8eeff0a9e4 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -12,13 +12,13 @@
  can_dock="true"
  can_minimize="true"
  visible="true" 
- width="400"
+ width="520"
  can_resize="true"
  min_width="200"
  min_height="150">
   <layout_stack follows="left|top|right|bottom"
                 height="344"
-                width="400"
+                width="520"
                 layout="topleft"
                 orientation="horizontal"
                 name="im_panels"
@@ -34,7 +34,7 @@
       auto_resize="false"
       user_resize="false" />
     <layout_panel height="344"
-                  width="235"
+                  width="355"
                   left_delta="146" 
                   top="0"
                   user_resize="false">
@@ -61,9 +61,9 @@
        name="chat_history"
        parse_highlights="true"
        allow_html="true" 
-       width="230">
+       width="350">
       </chat_history>
-      <line_editor follows="left|right" name="chat_editor" height="20" layout="topleft" width="225">
+      <line_editor follows="left|right" name="chat_editor" height="20" layout="topleft" width="345">
       </line_editor>
     </layout_panel>
   </layout_stack>
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 8dbcfe6360..52017218d6 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
@@ -19,26 +19,39 @@
      top="10"
      width="180"/>
 
-    <button
-     height="20"
-     label="Call Group"
-     left_delta="27"
-     name="call_btn"
-     width="125"/>
+    <panel
+     background_visible="true"
+     bg_alpha_color="0.2 0.2 0.2 1"
+     border="false"
+     bottom="1"
+     follows="left|bottom"
+     height="78"
+     left="0"
+     name="panel_buttons"
+     width="180">
 
-    <button
-     height="20"
-     label="Leave Call"
-     name="end_call_btn"
-     visible="false"
-     width="125"/>
+        <button
+         height="20"
+         label="Call Group"
+         left_delta="27"
+         name="call_btn"
+         width="125"/>
 
-    <button
-     enabled="false"
-     height="20"
-     label="Open Voice Controls"
-     name="voice_ctrls_btn"
-     visible="false"
-     width="125"/>
+        <button
+         height="20"
+         label="Leave Call"
+         name="end_call_btn"
+         visible="false"
+         width="125"/>
+
+        <button
+         enabled="false"
+         height="20"
+         label="Open Voice Controls"
+         name="voice_ctrls_btn"
+         visible="false"
+         width="125"/>
+
+    </panel>
 
 </panel>
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 737bb5bcb6..daa44ac75c 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
@@ -19,32 +19,44 @@
      top="10"
      width="180"/>
 
-    <button
-     height="20"
-     label="Group Info"
-     left_delta="27"
-     name="group_info_btn"
-     width="125"/>
+    <panel
+     background_visible="true"
+     bg_alpha_color="0.2 0.2 0.2 1"
+     border="false"
+     bottom="1"
+     follows="left|bottom"
+     height="98"
+     left="0"
+     name="panel_buttons"
+     width="180">
 
-    <button
-     height="20"
-     label="Call Group"
-     name="call_btn"
-     width="125"/>
+        <button
+         height="20"
+         label="Group Info"
+         left_delta="28"
+         name="group_info_btn"
+         width="125"/>
 
-    <button
-     height="20"
-     label="Leave Call"
-     name="end_call_btn"
-     visible="false"
-     width="125"/>
+        <button
+         height="20"
+         label="Call Group"
+         name="call_btn"
+         width="125"/>
 
-    <button
-     enabled="false"
-     height="20"
-     label="Open Voice Controls"
-     name="voice_ctrls_btn"
-     visible="false"
-     width="125"/>
+        <button
+         height="20"
+         label="Leave Call"
+         name="end_call_btn"
+         visible="false"
+         width="125"/>
 
+        <button
+         enabled="false"
+         height="20"
+         label="Open Voice Controls"
+         name="voice_ctrls_btn"
+         visible="false"
+         width="125"/>
+
+    </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index 35be31983c..d144d71dce 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -2,73 +2,88 @@
 <panel
  border="false"
  height="327"
+ layout="topleft"
  name="panel_im_control_panel"
- width="128">
+ width="131">
 
     <avatar_icon
      follows="left|top"
      height="125"
      left_delta="3"
      name="avatar_icon"
+     top="-10"
      width="125"/>
 
-    <button
+    <panel
+     background_visible="true"
+     bg_alpha_color="0.2 0.2 0.2 1"
+     border="false"
+     bottom="1"
      follows="left|bottom"
-     height="20"
-     label="View Profile"
-     name="view_profile_btn"
-     width="125"/>
+     height="195"
+     left="0"
+     name="panel_buttons"
+     width="131">
 
-    <button
-     follows="left|bottom"
-     height="20"
-     label="Add Friend"
-     name="add_friend_btn"
-     width="125"/>
+        <button
+         follows="left|bottom"
+         height="20"
+         label="View Profile"
+         left_delta="3"
+         name="view_profile_btn"
+         width="125"/>
 
-    <button
-     follows="left|bottom"
-     height="20"
-     label="Call"
-     name="call_btn"
-     width="125"/>
+        <button
+         follows="left|bottom"
+         height="20"
+         label="Add Friend"
+         name="add_friend_btn"
+         width="125"/>
 
-    <button
-     follows="left|bottom"
-     height="20"
-     label="Leave Call"
-     name="end_call_btn"
-     visible="false"
-     width="125"/>
+        <button
+         follows="left|bottom"
+         height="20"
+         label="Call"
+         name="call_btn"
+         width="125"/>
 
-    <button
-     enabled="false"
-     follows="left|bottom"
-     height="20"
-     label="Open Voice Controls"
-     name="voice_ctrls_btn"
-     visible="false"
-     width="125"/>
+        <button
+         follows="left|bottom"
+         height="20"
+         label="Leave Call"
+         name="end_call_btn"
+         visible="false"
+         width="125"/>
 
-    <button
-     follows="left|bottom"
-     height="20"
-     label="Teleport"
-     name="teleport_btn"
-     width="125"/>
+        <button
+         enabled="false"
+         follows="left|bottom"
+         height="20"
+         label="Open Voice Controls"
+         name="voice_ctrls_btn"
+         visible="false"
+         width="125"/>
 
-    <button
-     follows="left|bottom"
-     height="20"
-     label="Share"
-     name="share_btn"
-     width="125"/>
+        <button
+         follows="left|bottom"
+         height="20"
+         label="Teleport"
+         name="teleport_btn"
+         width="125"/>
 
-    <button
-     follows="left|bottom"
-     height="20"
-     label="Pay"
-     name="pay_btn"
-     width="125"/>
+        <button
+         follows="left|bottom"
+         height="20"
+         label="Share"
+         name="share_btn"
+         width="125"/>
+
+        <button
+         follows="left|bottom"
+         height="20"
+         label="Pay"
+         name="pay_btn"
+         width="125"/>
 
+    </panel>
 </panel>
-- 
cgit v1.2.3


From 8346cd6806f479053a5b81b496dbb9b88ed26bb5 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Wed, 4 Nov 2009 19:53:17 +0200
Subject: Fixed normal bug EXT-2192 "Remove "Share" button from all Places Tabs
 (including Place/Landmark info)". - Removed "Share" button and resized other
 buttons to take its place.

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index 87ac5be74a..488b9582d5 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -79,7 +79,7 @@ background_visible="true"
          left="5"
          name="teleport_btn"
          top="0"
-         width="77" />
+         width="100" />
         <button
          follows="bottom|left"
          font="SansSerifSmall"
@@ -89,18 +89,7 @@ background_visible="true"
          left_pad="5"
          name="map_btn"
          top="0"
-         width="50" />
-        <button
-         enabled="false"
-         follows="bottom|left"
-         font="SansSerifSmall"
-         height="19"
-         label="Share"
-         layout="topleft"
-         left_pad="5"
-         name="share_btn"
-         top="0"
-         width="60" />
+         width="70" />
         <button
          follows="bottom|left"
          font="SansSerifSmall"
@@ -110,7 +99,7 @@ background_visible="true"
          left_pad="5"
          name="edit_btn"
          top="0"
-         width="50" />
+         width="70" />
         <button
          follows="bottom|right"
          font="SansSerifSmall"
-- 
cgit v1.2.3


From f59c8b5e4e2625930e24ea28cd8e3a713cffed43 Mon Sep 17 00:00:00 2001
From: Sergey Borushevsky <sborushevsky@productengine.com>
Date: Wed, 4 Nov 2009 20:09:06 +0200
Subject: Implemented normal task EXT-2149 (IM Text Editors should display
 grayed text "TO [avatar_name/group_name/ad-hoc conference]")

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 8eeff0a9e4..1585d976b3 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -63,7 +63,13 @@
        allow_html="true" 
        width="350">
       </chat_history>
-      <line_editor follows="left|right" name="chat_editor" height="20" layout="topleft" width="345">
+      <line_editor
+       follows="left|right"
+       height="20"
+       label="To"
+       layout="topleft"
+       name="chat_editor"
+       width="345">
       </line_editor>
     </layout_panel>
   </layout_stack>
-- 
cgit v1.2.3


From e8ee119da107c0c473c836f1f0233621f14e2a15 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Wed, 4 Nov 2009 20:23:41 +0200
Subject: Major sub-task EXT-2142, additional commit: moved call buttons panel
 to control panel bottom, removed other buttons from panel_call_button

--HG--
branch : product-engine
---
 .../default/xui/en/panel_adhoc_control_panel.xml   | 13 +++-
 .../default/xui/en/panel_group_control_panel.xml   | 26 ++++---
 .../default/xui/en/panel_im_control_panel.xml      | 86 +++++++++++-----------
 3 files changed, 70 insertions(+), 55 deletions(-)

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

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 52017218d6..24c46b314f 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
@@ -25,19 +25,23 @@
      border="false"
      bottom="1"
      follows="left|bottom"
-     height="78"
+     height="70"
      left="0"
-     name="panel_buttons"
+     left_pad="0"
+     name="panel_call_buttons"
+     top_pad="0"
      width="180">
 
         <button
+         bottom="10"
          height="20"
-         label="Call Group"
-         left_delta="27"
+         label="Call"
+         left_delta="28"
          name="call_btn"
          width="125"/>
 
         <button
+         bottom="40"
          height="20"
          label="Leave Call"
          name="end_call_btn"
@@ -46,6 +50,7 @@
 
         <button
          enabled="false"
+         bottom="10"
          height="20"
          label="Open Voice Controls"
          name="voice_ctrls_btn"
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 daa44ac75c..46f34949a8 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
@@ -19,31 +19,37 @@
      top="10"
      width="180"/>
 
+    <button
+     bottom_pad="0"
+     height="20"
+     label="Group Info"
+     left_delta="28"
+     name="group_info_btn"
+     width="125"/>
+
     <panel
      background_visible="true"
      bg_alpha_color="0.2 0.2 0.2 1"
      border="false"
      bottom="1"
      follows="left|bottom"
-     height="98"
+     height="70"
      left="0"
-     name="panel_buttons"
+     left_pad="0"
+     name="panel_call_buttons"
+     top_pad="0"
      width="180">
 
         <button
-         height="20"
-         label="Group Info"
-         left_delta="28"
-         name="group_info_btn"
-         width="125"/>
-
-        <button
+         bottom="10"
          height="20"
          label="Call Group"
+         left_delta="28"
          name="call_btn"
          width="125"/>
 
         <button
+         bottom="40"
          height="20"
          label="Leave Call"
          name="end_call_btn"
@@ -52,6 +58,7 @@
 
         <button
          enabled="false"
+         bottom="10"
          height="20"
          label="Open Voice Controls"
          name="voice_ctrls_btn"
@@ -59,4 +66,5 @@
          width="125"/>
 
     </panel>
+
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index d144d71dce..f77a2ec730 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -2,7 +2,6 @@
 <panel
  border="false"
  height="327"
- layout="topleft"
  name="panel_im_control_panel"
  width="131">
 
@@ -14,41 +13,64 @@
      top="-10"
      width="125"/>
 
+    <button
+     follows="left|bottom"
+     height="20"
+     label="View Profile"
+     name="view_profile_btn"
+     width="125"/>
+
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Add Friend"
+     name="add_friend_btn"
+     width="125"/>
+
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Teleport"
+     name="teleport_btn"
+     width="125"/>
+
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Share"
+     name="share_btn"
+     width="125"/>
+
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Pay"
+     name="pay_btn"
+     width="125"/>
+
     <panel
      background_visible="true"
      bg_alpha_color="0.2 0.2 0.2 1"
      border="false"
      bottom="1"
      follows="left|bottom"
-     height="195"
+     height="70"
      left="0"
-     name="panel_buttons"
+     left_pad="0"
+     name="panel_call_buttons"
+     top_pad="0"
      width="131">
 
         <button
-         follows="left|bottom"
-         height="20"
-         label="View Profile"
-         left_delta="3"
-         name="view_profile_btn"
-         width="125"/>
-
-        <button
-         follows="left|bottom"
-         height="20"
-         label="Add Friend"
-         name="add_friend_btn"
-         width="125"/>
-
-        <button
-         follows="left|bottom"
+         bottom="10"
          height="20"
          label="Call"
+         left_delta="3"
          name="call_btn"
          width="125"/>
 
         <button
-         follows="left|bottom"
+         bottom="40"
          height="20"
          label="Leave Call"
          name="end_call_btn"
@@ -57,33 +79,13 @@
 
         <button
          enabled="false"
-         follows="left|bottom"
+         bottom="10"
          height="20"
          label="Open Voice Controls"
          name="voice_ctrls_btn"
          visible="false"
          width="125"/>
 
-        <button
-         follows="left|bottom"
-         height="20"
-         label="Teleport"
-         name="teleport_btn"
-         width="125"/>
-
-        <button
-         follows="left|bottom"
-         height="20"
-         label="Share"
-         name="share_btn"
-         width="125"/>
-
-        <button
-         follows="left|bottom"
-         height="20"
-         label="Pay"
-         name="pay_btn"
-         width="125"/>
-
     </panel>
+
 </panel>
-- 
cgit v1.2.3


From eb02d77ff5d20b99cc35fe9082cf5a22f634a7e1 Mon Sep 17 00:00:00 2001
From: Eugene Kondrashev <ekondrashev@productengine.com>
Date: Wed, 4 Nov 2009 21:33:14 +0200
Subject: Implemented major sub-task EXT-2131 - Output monitor contols should
 only be shown for Group Chat and Adhoc Chat when in a Voice Call. Added
 onStateChange callback support for voice channel. Added showing/hiding logic
 of speaking indicator.

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

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

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 24c46b314f..0246e21d25 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
@@ -16,6 +16,7 @@
      opaque="false"
      show_info_btn="false"
      show_profile_btn="false"
+     show_speaking_indicator="false"
      top="10"
      width="180"/>
 
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 46f34949a8..763dd7b922 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
@@ -16,6 +16,7 @@
      opaque="false"
      show_info_btn="false"
      show_profile_btn="false"
+     show_speaking_indicator="false"
      top="10"
      width="180"/>
 
-- 
cgit v1.2.3


From 8c27615aa5c1fc61fa0a5877717699d5df47476d Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Wed, 4 Nov 2009 22:17:23 +0200
Subject: Implemented normal sub-task EXT-2144 (IM P2p control panel should
 contain avatar name under avatar icon aligned to the left side)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_im_session.xml  | 14 +++++++-------
 .../skins/default/xui/en/panel_im_control_panel.xml        | 12 +++++++++++-
 2 files changed, 18 insertions(+), 8 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 1585d976b3..70af2f63b6 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -3,7 +3,7 @@
  legacy_header_height="18"
  background_visible="true"
  follows="left|top|right|bottom"
- height="359"
+ height="369"
  layout="topleft"
  left="0"
  name="panel_im"
@@ -14,10 +14,10 @@
  visible="true" 
  width="520"
  can_resize="true"
- min_width="200"
- min_height="150">
+ min_width="350"
+ min_height="350">
   <layout_stack follows="left|top|right|bottom"
-                height="344"
+                height="354"
                 width="520"
                 layout="topleft"
                 orientation="horizontal"
@@ -28,12 +28,12 @@
       name="panel_im_control_panel"
       layout="topleft"
       top_delta="-3"
-      height="344"
+      height="354"
       follows="left"
       label="IM Control Panel"
       auto_resize="false"
       user_resize="false" />
-    <layout_panel height="344"
+    <layout_panel height="354"
                   width="355"
                   left_delta="146" 
                   top="0"
@@ -56,7 +56,7 @@
        length="1"
        follows="left|top|right|bottom"
        font="SansSerif"
-       height="290"
+       height="300"
        layout="topleft"
        name="chat_history"
        parse_highlights="true"
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index f77a2ec730..c8b134cdf0 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  border="false"
- height="327"
+ height="350"
  name="panel_im_control_panel"
  width="131">
 
@@ -13,6 +13,16 @@
      top="-10"
      width="125"/>
 
+    <text
+     follows="left|right"
+     font="SansSerifBig"
+     height="16"
+     layout="topleft"
+     name="avatar_name"
+     use_ellipses="true"
+     value="Unknown"
+     width="125" />
+
     <button
      follows="left|bottom"
      height="20"
-- 
cgit v1.2.3