From e12126bf89ee862603f02f709f69bb013c8a8635 Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Mon, 16 Nov 2009 19:27:35 +0200
Subject: implemented task EXT-1899   Add button to Gestures floater which
 activates/deactivates

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml
index a3ac878202..21d292847a 100644
--- a/indra/newview/skins/default/xui/en/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_gesture.xml
@@ -83,7 +83,20 @@
                  tool_tip="Make new gesture"
                  top_delta="0"
                  width="18" />
-                <button
+              <button
+                 follows="bottom|left"
+                 font="SansSerifBigBold"
+                 height="10"
+                 image_hover_selected="Activate_Checkmark"
+                 image_selected="Activate_Checkmark"
+                 image_unselected="Activate_Checkmark"
+                 layout="topleft"
+                 left_pad="5"
+                 name="activate_btn"
+                 tool_tip="Activate/Deactivate selected gesture"
+                 top="10"
+                 width="10" />
+              <button
                  follows="bottom|right"
                  font="SansSerifBigBold"
                  height="18"
-- 
cgit v1.2.3


From 743c8f7cbbc189e5ba3d0f5058790232ac6d03aa Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Mon, 16 Nov 2009 19:53:07 +0200
Subject: fixed minor bug EXT-2292   Teleport History items don't fit to width
 of panel

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_teleport_history_item.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_teleport_history_item.xml b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
index 1f67a0a732..4ab6175805 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
@@ -26,7 +26,7 @@
      name="selected_icon"
      top="0"
      visible="false"
-     width="320" />
+     width="380" />
     <icon
      height="16"
      follows="top|left"
@@ -46,7 +46,7 @@
      text_color="white"
      top="4"
      value="..."
-     width="242" />
+     width="330" />
     <button
      follows="right"
      height="20"
-- 
cgit v1.2.3


From 909125258dabd0722785519f689d20608bb13fc1 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Mon, 16 Nov 2009 14:23:46 -0500
Subject: Minor cleanup, changed inventorypanel start folder special casing
 keyword "INVENTORY" to using generic "My Inventory" keyword.

--HG--
branch : avatar-pipeline
---
 indra/newview/skins/default/xui/en/panel_landmarks.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_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index f05684db10..4b91dc6294 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -63,7 +63,7 @@
              left="0"
              mouse_opaque="true"
              name="my_inventory_list"
-             start_folder="INVENTORY"
+             start_folder="My Inventory"
              width="380"/>
           </accordion_tab>
           <accordion_tab
-- 
cgit v1.2.3


From 19d90dc5ed5494308744c02be9afb7eb021244e0 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Mon, 16 Nov 2009 21:40:11 +0200
Subject: fixed minor bug EXT-2506 ('Add friend' menu item is enabled in fiend
 miniinspector's gear menu).

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
index 590621062c..a731996a1a 100644
--- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
@@ -17,6 +17,8 @@
    name="add_friend">
     <menu_item_call.on_click
      function="InspectAvatar.AddFriend"/>
+    <menu_item_call.on_enable
+     function="InspectAvatar.Gear.Enable"/>
   </menu_item_call>
   <menu_item_call
    label="IM"
-- 
cgit v1.2.3


From 63192ae2b9cb767b683672bba9a057dc4fb1ee10 Mon Sep 17 00:00:00 2001
From: Steve Bennetts <steve@lindenlab.com>
Date: Mon, 16 Nov 2009 15:46:53 -0800
Subject: EXT-2264 - Statistics window puts items in wrong categories

---
 .../newview/skins/default/xui/en/floater_stats.xml | 322 ++++++++++-----------
 1 file changed, 161 insertions(+), 161 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index 68a4867167..f9dacf0207 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -405,179 +405,179 @@
 				 show_bar="false"
 				 show_mean="false" >
 			  </stat_bar>
+		  </stat_view>
 
-			  <stat_bar
-				 name="simagentups"
-				 label="Agent Updates/Sec"
-				 stat="simagentups"
-				 precision="1"
-				 bar_min="0.f"
-				 bar_max="100.f" 
-				 tick_spacing="25.f"
-				 label_spacing="50.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
+			<stat_bar
+			   name="simagentups"
+			   label="Agent Updates/Sec"
+			   stat="simagentups"
+			   precision="1"
+			   bar_min="0.f"
+			   bar_max="100.f" 
+			   tick_spacing="25.f"
+			   label_spacing="50.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
-			  <stat_bar
-				 name="simmainagents"
-				 label="Main Agents"
-				 stat="simmainagents"
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="80.f" 
-				 tick_spacing="10.f"
-				 label_spacing="40.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
+			<stat_bar
+			   name="simmainagents"
+			   label="Main Agents"
+			   stat="simmainagents"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="80.f" 
+			   tick_spacing="10.f"
+			   label_spacing="40.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
-			  <stat_bar
-				 name="simchildagents"
-				 label="Child Agents"
-				 stat="simchildagents"
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="40.f" 
-				 tick_spacing="5.f"
-				 label_spacing="10.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
+			<stat_bar
+			   name="simchildagents"
+			   label="Child Agents"
+			   stat="simchildagents"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="40.f" 
+			   tick_spacing="5.f"
+			   label_spacing="10.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
-			  <stat_bar
-				 name="simobjects"
-				 label="Objects"
-				 stat="simobjects"
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="30000.f" 
-				 tick_spacing="5000.f"
-				 label_spacing="10000.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
+			<stat_bar
+			   name="simobjects"
+			   label="Objects"
+			   stat="simobjects"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="30000.f" 
+			   tick_spacing="5000.f"
+			   label_spacing="10000.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
-			  <stat_bar
-				 name="simactiveobjects"
-				 label="Active Objects"
-				 stat="simactiveobjects"
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="800.f" 
-				 tick_spacing="100.f"
-				 label_spacing="200.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
+			<stat_bar
+			   name="simactiveobjects"
+			   label="Active Objects"
+			   stat="simactiveobjects"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="800.f" 
+			   tick_spacing="100.f"
+			   label_spacing="200.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
-			  <stat_bar
-				 name="simactivescripts"
-				 label="Active Scripts"
-				 stat="simactivescripts"
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="800.f" 
-				 tick_spacing="100.f"
-				 label_spacing="200.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
+			<stat_bar
+			   name="simactivescripts"
+			   label="Active Scripts"
+			   stat="simactivescripts"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="800.f" 
+			   tick_spacing="100.f"
+			   label_spacing="200.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
-			  <stat_bar
-				 name="simscripteps"
-				 label="Script Events"
-				 stat="simscripteps"
-				 unit_label="eps"
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="20000.f" 
-				 tick_spacing="2500.f"
-				 label_spacing="5000.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
+			<stat_bar
+			   name="simscripteps"
+			   label="Script Events"
+			   stat="simscripteps"
+			   unit_label="eps"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="20000.f" 
+			   tick_spacing="2500.f"
+			   label_spacing="5000.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
-			  <stat_bar
-				 name="siminpps"
-				 label="Packets In"
-				 stat="siminpps"
-				 unit_label="pps"
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="2000.f" 
-				 tick_spacing="250.f"
-				 label_spacing="1000.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
+			<stat_bar
+			   name="siminpps"
+			   label="Packets In"
+			   stat="siminpps"
+			   unit_label="pps"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="2000.f" 
+			   tick_spacing="250.f"
+			   label_spacing="1000.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
-			  <stat_bar
-				 name="simoutpps"
-				 label="Packets Out"
-				 stat="simoutpps"
-				 unit_label="pps" 
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="2000.f" 
-				 tick_spacing="250.f"
-				 label_spacing="1000.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
+			<stat_bar
+			   name="simoutpps"
+			   label="Packets Out"
+			   stat="simoutpps"
+			   unit_label="pps" 
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="2000.f" 
+			   tick_spacing="250.f"
+			   label_spacing="1000.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
-			  <stat_bar
-				 name="simpendingdownloads"
-				 label="Pending Downloads"
-				 stat="simpendingdownloads"
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="800.f" 
-				 tick_spacing="100.f"
-				 label_spacing="200.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
+			<stat_bar
+			   name="simpendingdownloads"
+			   label="Pending Downloads"
+			   stat="simpendingdownloads"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="800.f" 
+			   tick_spacing="100.f"
+			   label_spacing="200.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
-			  <stat_bar
-				 name="simpendinguploads"
-				 label="Pending Uploads"
-				 stat="simpendinguploads"
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="100.f" 
-				 tick_spacing="25.f"
-				 label_spacing="50.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
+			<stat_bar
+			   name="simpendinguploads"
+			   label="Pending Uploads"
+			   stat="simpendinguploads"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="100.f" 
+			   tick_spacing="25.f"
+			   label_spacing="50.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
-			  <stat_bar
-				 name="simtotalunackedbytes"
-				 label="Total Unacked Bytes"
-				 stat="simtotalunackedbytes"
-				 unit_label="kb"
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="100000.f" 
-				 tick_spacing="25000.f"
-				 label_spacing="50000.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-			</stat_view>
+			<stat_bar
+			   name="simtotalunackedbytes"
+			   label="Total Unacked Bytes"
+			   stat="simtotalunackedbytes"
+			   unit_label="kb"
+			   precision="0"
+			   bar_min="0.f"
+			   bar_max="100000.f" 
+			   tick_spacing="25000.f"
+			   label_spacing="50000.f" 
+			   show_per_sec="false"
+			   show_bar="false"
+			   show_mean="false" >
+			</stat_bar>
 
 			<stat_view
 			   name="simperf"
-- 
cgit v1.2.3


From 516b2fe7cdf23947600a0983ad80f9a44534cfe2 Mon Sep 17 00:00:00 2001
From: Steve Bennetts <steve@lindenlab.com>
Date: Mon, 16 Nov 2009 17:41:31 -0800
Subject: EXT-525 - World Maps landmarks drop-down does not find the location

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 387ffbd5b3..c60cc163c8 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -340,6 +340,8 @@
          label="Landmarks"
          name="item1"
          value="None" />
+		<combo_box.commit_callback
+		function="WMap.Landmark"/>
     </combo_box>
     <icon
      color="0.5 0 0 1"
-- 
cgit v1.2.3


From 3df42196e3ead1419d456a715081d37b454b5bc1 Mon Sep 17 00:00:00 2001
From: Dmitry Oleshko <doleshko@productengine.com>
Date: Tue, 17 Nov 2009 11:46:25 +0200
Subject: fixed normal bug (EXT-2505) Implement ellipsis for attachments in
 Group Notices

adjusted width of the "Attachment" field and added "ellipses" attribute

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml
index 984a799b41..e699a77581 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml
@@ -104,7 +104,8 @@
      name="attachment"
      text_color="GroupNotifyTextColor"
      value="Attachment"
-     width="280" />
+     use_ellipses="true"
+     width="250" />
     <button
      bottom="130"
      follows="bottom"
-- 
cgit v1.2.3


From 812d18515ddefd11fe8c5fc7f655280a231670f5 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Tue, 17 Nov 2009 13:03:08 +0200
Subject: Completed major sub-task EXT-991 (Update bottom bar behavior on
 resize)  - added possibility to shrink/extend buttons (gestures, move, view)
 while resizing  - I had to add LLLayoutStack::getPanelMinSize interface to
 validate width of Layout panels with these buttons

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

(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 a902f50582..d2933c0c0e 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -94,7 +94,7 @@
          min_height="28"
          width="82"
          top_delta="0"
-         min_width="82"
+         min_width="52"
          name="gesture_panel"
          user_resize="false">
          <gesture_combo_box
@@ -105,9 +105,13 @@
           name="Gesture"
           left="0"
           top="3"
-         use_ellipses="true"
           width="82"
-          tool_tip="Shows/hides gestures"/>
+          tool_tip="Shows/hides gestures">
+             <gesture_combo_box.drop_down_button
+              font="SansSerifSmall"
+              pad_right="10" 
+              use_ellipses="true" />
+         </gesture_combo_box>
         </layout_panel>
 		 <icon
          auto_resize="false"
@@ -131,7 +135,7 @@
          name="movement_panel"
          user_resize="false"
          width="80"
-         min_width="80">
+         min_width="49">
             <button
              follows="left|right"
              height="23"
@@ -167,7 +171,7 @@
          height="28"
          layout="topleft"
          min_height="28"
-         min_width="80"
+         min_width="49"
          name="cam_panel"
          user_resize="false"
          width="80">
-- 
cgit v1.2.3


From 93f8da6906dfd9c2bd34ffe82537e5f1b3c06f93 Mon Sep 17 00:00:00 2001
From: Dmitry Oleshko <doleshko@productengine.com>
Date: Tue, 17 Nov 2009 13:23:39 +0200
Subject: fixed normal bug (EXT-2543) Notification toasts overlap bottom tray

adjusted control's height in order to remove a negative BOTTOM value

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/main_view.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/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 9e35c95d45..14a4949df7 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -10,7 +10,7 @@
   <layout_stack border_size="0"
                 follows="all"
                 mouse_opaque="false"
-                height="772"
+                height="768"
                 name="menu_stack"
                 orientation="vertical"
                 top="0">
-- 
cgit v1.2.3


From 1804fce466ff242e63f995bc47178e1514c5a59d Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Tue, 17 Nov 2009 13:52:16 +0200
Subject: fix4 normal task EXT-2521 Remove timestamp and fake voice indicator
 from nearby chat toasts

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml
index 05b04bbf8e..d8a0c877fd 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml
@@ -15,19 +15,13 @@
       		color="1 1 1 1" enabled="true" name="avatar_icon"
 		  />
     	<text
-        	width="130" top="25" left="40" height="20" follows="left|right|top"
+        	width="150" top="25" left="40" height="20" follows="left|right|top"
         	font="SansSerifBigBold" text_color="white" word_wrap="false" use_ellipses="true"
         	mouse_opaque="true" name="sender_name" >
 	      Jerry Knight
     	</text>
-    	<icon top="22" left="170" width="15" height="15" follows="top|right"
+    	<icon top="22" left="215" width="15" height="15" follows="top|right"
       		image_name="icn_voice-pvtfocus.tga" visible="false" name="msg_inspector"/>
-    	<icon top="22" left="190" width="10" height="10" follows="top|right"
-      		image_name="speaking_indicator.tga"	name="msg_icon"/>
-    	<text width="35" top="22" left="205" height="20" follows="right|top"
-        		text_color="white" word_wrap="true" mouse_opaque="true" name="msg_time" >
-      		10:32
-		</text>
 	</panel>
 	<text_chat
       top="-35" left="10" right="-10" height="120" follows="left|right|bottom"
-- 
cgit v1.2.3


From acd1743a9627681c5ae015e81facaebbb0438456 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Tue, 17 Nov 2009 13:58:06 +0200
Subject: Fixed minor bug EXT-1230 ('Block object by name' btn doesn't have a
 tool-tip).

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
index 5c8a8ee208..3842c2a8db 100644
--- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
@@ -61,6 +61,7 @@
      layout="topleft"
      left_delta="0"
      name="Block object by name..."
+     tool_tip="Pick an object to block by name"
      top_pad="4"
      width="210" >
         <button.commit_callback
-- 
cgit v1.2.3


From 4c623cb7bb952ed034ce0457fef29c535ca8807e Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Tue, 17 Nov 2009 14:02:52 +0200
Subject: completed major task EXT-2516 Remove the close button from IM window
 title

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

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

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 452d28d4ea..70d708f0e7 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -9,6 +9,7 @@
  name="panel_im"
  help_topic="panel_im"
  top="0"
+ can_close="false"
  can_dock="true"
  can_minimize="true"
  visible="true" 
-- 
cgit v1.2.3


From d43e33400a2ef9d89ed6d13067055b5b1edbde78 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Tue, 17 Nov 2009 14:33:07 +0200
Subject: implemented EXT-2515 "Docked floaters should be resizeable";

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
index 7f58ea132e..84e549f773 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -3,7 +3,7 @@
  legacy_header_height="18"
  can_minimize="true"
  can_tear_off="false"
- can_resize="false"
+ can_resize="true"
  can_drag_on_left="false"
  can_close="false"
  can_dock="true"
diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml
index e1f07a49e7..be6d63716c 100644
--- a/indra/newview/skins/default/xui/en/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml
@@ -15,7 +15,7 @@
  height="23"
  can_minimize="true"
  can_tear_off="false"
- can_resize="false"
+ can_resize="true"
  can_drag_on_left="false"
  can_close="false"
  can_dock="true"
-- 
cgit v1.2.3


From 0336752a5eb0b4847812ca372f788d4ba7751a52 Mon Sep 17 00:00:00 2001
From: Eugene Kondrashev <ekondrashev@productengine.com>
Date: Tue, 17 Nov 2009 16:07:01 +0200
Subject: Implemented normal task EXT-1551-[BSI] Add scrollbar to group notice
 notification

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml
index e699a77581..d22d58329c 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml
@@ -3,7 +3,7 @@
  background_visible="true"
  bevel_style="in"
  bg_alpha_color="0 0 0 0"
- height="135"
+ height="90"
  label="instant_message"
  layout="topleft"
  left="0"
@@ -12,7 +12,13 @@
  width="305">
     <string
      name="message_max_lines_count"
-     value="4" />
+     value="7" />
+    <string
+     name="subject_font"
+     value="SANSSERIF_BIG" />
+    <string
+     name="date_font"
+     value="SANSSERIF" />
     <panel
      background_visible="true"
      bevel_style="in"
@@ -47,46 +53,27 @@
          value="Sender Name / Group Name"
          width="230" />
     </panel>
-    <text
-     follows="top"
-     font="SansSerifBig"
-     height="20"
-     layout="topleft"
-     left="25"
-     name="subject"
-     text_color="GroupNotifyTextColor"
-     top="40"
-     use_ellipses="true"
-     value="subject"
-     width="270"
-     wrap="true" />
-    <text
-     follows="top"
-     font="SansSerif"
-     height="20"
-     layout="topleft"
-     left="25"
-     name="datetime"
-     text_color="GroupNotifyTextColor"
-     top="80"
-     use_ellipses="true"
-     value="datetime"
-     width="270"
-     wrap="true" />
-    <text
+    <text_editor
+     allow_html="true"
+     enabled="true"
      follows="left|top|bottom|right"
      height="0"
      layout="topleft"
      left="25"
+     max_length="2147483647"
      name="message"
+     parse_highlights="true"
+     read_only="true"
      text_color="GroupNotifyTextColor"
-     top="100"
+     top="40"
+     type="string"
      use_ellipses="true"
      value="message"
-     width="270"
-     wrap="true" />
+     width="270" 
+	 word_wrap="true" >
+    </text_editor>
     <icon
-     bottom="122"
+     bottom="60"
      follows="left|bottom|right"
      height="15"
      layout="topleft"
@@ -95,7 +82,7 @@
      name="attachment_icon"
      width="15" />
     <text
-     bottom="122"
+     bottom="60"
      follows="left|bottom|right"
      font="SansSerif"
      height="15"
@@ -107,7 +94,7 @@
      use_ellipses="true"
      width="250" />
     <button
-     bottom="130"
+     bottom="85"
      follows="bottom"
      height="20"
      label="OK"
-- 
cgit v1.2.3


From 32dccaf3d89b40b711d69088a3e390119c7efc7f Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Tue, 17 Nov 2009 10:36:11 -0500
Subject: Sidepanel Appearance refactoring.  Work in progress.

1. Changed sidepanel names to have "sidepanel" (e.g. panel_appearance -> sidepanel_appearance)
2. Changed some "Looks" names to "Outfits"
3. Changed LLPanelLooks to LLPanelOutfitsInventory (to match other inventory panel naming)
4. Took out tab from sidepanel_appearance.

--HG--
branch : avatar-pipeline
---
 .../skins/default/xui/en/floater_inventory.xml     |   2 +-
 .../default/xui/en/panel_outfits_inventory.xml     |  81 ++++++++++++++++
 .../skins/default/xui/en/panel_side_tray.xml       |   6 +-
 .../skins/default/xui/en/sidepanel_appearance.xml  | 104 +++++++++++++++++++++
 4 files changed, 189 insertions(+), 4 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
 create mode 100644 indra/newview/skins/default/xui/en/sidepanel_appearance.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml
index b48c962413..7cfcac8a9a 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory.xml
@@ -30,7 +30,7 @@
      name="Fetched">
         Fetched
     </floater.string>
-<panel
+    <panel
      bottom="560"
 	 class="panel_main_inventory"
 	 filename="panel_main_inventory.xml"
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
new file mode 100644
index 0000000000..f511ec0d6f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="Outfits" 
+	  bottom="0" 
+	  height="326" 
+	  left="0" 
+	  width="310"
+	  border="true"
+	  follows="left|top|right|bottom">
+	 <inventory_panel 
+	 	 allow_multi_select="true" 
+		 border="true" 
+		 bottom="0"
+	     follows="left|top|right|bottom" 
+		 height="326" 
+		 left="0" 
+		 mouse_opaque="true"
+	     name="outfits_list"
+		 width="310"
+		 start_folder="My Outfits"/>
+	<button bottom="0"
+		 halign="center"
+		 height="16"
+		 label=">"
+		 enabled="false"
+	     mouse_opaque="false"
+		 name="selector"
+		 width="20"
+		 left="0"
+		 visible="false"
+	     follows="right|bottom"
+		 tool_tip="View outfit properties"/>
+    <panel
+     background_visible="true"
+     bevel_style="none"
+     bottom="0"
+     follows="left|right|bottom"
+     height="30"
+     layout="bottomleft"
+     left="0"
+	 visible="true"
+     name="bottom_panel"
+     width="310">
+        <button
+         follows="bottom|left"
+         tool_tip="Show additional options"
+         height="18"
+         image_disabled="OptionsMenu_Disabled"
+         image_selected="OptionsMenu_Press"
+         image_unselected="OptionsMenu_Off"
+         layout="topleft"
+         left="10"
+         name="options_gear_btn"
+         picture_style="true"
+         top="6"
+         width="18" />
+        <button
+         follows="bottom|left"
+         height="18"
+         image_selected="AddItem_Press"
+         image_unselected="AddItem_Off"
+         image_disabled="AddItem_Disabled"
+         layout="topleft"
+         left_pad="5"
+         name="add_btn"
+         picture_style="true"
+         tool_tip="Add new item"
+         width="18" />
+        <dnd_button
+         follows="bottom|right"
+         height="18"
+         image_selected="TrashItem_Press"
+         image_unselected="TrashItem_Off"
+         layout="topleft"
+         right="-5"
+         name="trash_btn"
+         picture_style="true"
+         tool_tip="Remove selected item"
+         top="6"
+         width="18" />
+    </panel>
+</panel>
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 a419a02d75..d02354a647 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -120,9 +120,9 @@
     background_visible="true"
   >
       <panel
-        class="panel_appearance"
-        name="panel_appearance"
-        filename="panel_appearance.xml"
+        class="sidepanel_appearance"
+        name="sidepanel_appearance"
+        filename="sidepanel_appearance.xml"
         label="Edit Appearance"
         font="SansSerifBold"
       />
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
new file mode 100644
index 0000000000..d87211d432
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+	  background_visible="true"
+	  follows="all"
+	  height="400"
+	  label="Appearance"
+	  layout="topleft"
+	  min_height="350"
+	  min_width="240"
+	  name="appearance panel"
+	  width="333">
+     <string
+		 name="looks_tab_title"
+		 value="Looks" />
+     <panel
+		 left="5" width="320" height="55"
+		 background_visible="true"
+		 background_opaque="false"
+		 bg_alpha_color="0.2 0.2 0.2 1.0"
+		 name="panel_currentlook"
+		 follows="left|top|right">
+		<text
+			 top="-5" width="200" left="5" height="10" follows="left|right|top"
+        	 font="SansSerif" text_color="LtGray" word_wrap="true"
+        	 mouse_opaque="false" name="currentlook_title">
+					Current Look
+    	</text>
+  		<text
+			 top="-30" left="8" height="10" follows="left|right|top"
+      		 font="SansSerifBold" text_color="white" word_wrap="true"
+      		 mouse_opaque="false" name="currentlook_name" >
+					MyLook
+  		</text>
+  	    <button
+  	     	 follows="left|right|top"
+  	     	 font="SansSerif"
+  	     	 top="28" right="-105" width="60" height="20"
+  	     	 layout="topleft"
+  		 	 label="Edit"
+  	     	 name="editappearance_btn"/>
+	</panel>
+
+    <filter_editor
+  	     follows="left|top|right"
+  	     font="SansSerif"
+  	     label="Filter"
+  	     layout="topleft"
+  	     left="15" 
+		 width="313"
+		 height="20"
+  	     name="Filter" />
+    <panel
+   	     class="panel_outfits_inventory"
+   	     filename="panel_outfits_inventory.xml"
+ 	     name="panel_outfits_inventory"
+  	     follows="all"
+  	     height="271"
+  	     halign="center"
+  	     layout="topleft"
+  	     left="10"
+  	     top_pad="19"
+  	     width="313" />
+    <button
+  	     follows="bottom|left"
+  	     font="SansSerifSmallBold"
+  	     height="25"
+  	     label="Wear"
+  	     layout="topleft"
+  	     left="10"
+  	     name="wear_btn"
+     	 top_pad="0"
+       	 width="80" />
+    <button
+    	 follows="bottom|left"
+  	     font="SansSerifSmallBold"
+  	     height="25"
+  	     label="New Look"
+  	     layout="topleft"
+  	     left_pad="0"
+  	     name="newlook_btn"
+  	     top_delta="0"
+   	     width="90" />
+
+	<panel
+       	 class="panel_look_info"
+       	 filename="panel_look_info.xml"
+       	 follows="all"
+       	 layout="topleft"
+       	 left="0"
+       	 name="panel_look_info"
+       	 top="-200"
+       	 visible="false" />
+
+	<panel
+	   	 class="panel_edit_wearable"
+	   	 filename="panel_edit_wearable.xml"
+	   	 follows="all"
+	   	 layout="topleft"
+	   	 left="0"
+	   	 name="panel_edit_wearable"
+	   	 top="-200"
+	   	 visible="false"
+	   	 width="333" />
+</panel>
-- 
cgit v1.2.3


From 580b2331f5feba6b7ac95c23dddc81cc6743dccf Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Tue, 17 Nov 2009 13:06:30 -0500
Subject: Added gear menu for outfits panel.

--HG--
branch : avatar-pipeline
---
 .../en/panel_outfits_inventory_gear_default.xml    | 42 ++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml

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

diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml
new file mode 100644
index 0000000000..c8c79f8761
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu
+ bottom="806"
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="menu_gear_default"
+ visible="false">
+    <menu_item_call
+     label="New Outfit"
+     layout="topleft"
+     name="new">
+        <on_click
+         function="panel_outfits_inventory_gear_default.Custom.Action"
+         parameter="new" />
+        <on_enable
+		 function="panel_outfits_inventory_gear_default.Enable"
+		 parameter="new" />
+    </menu_item_call>
+    <menu_item_call
+     label="Wear Outfit"
+     layout="topleft"
+     name="wear">
+        <on_click
+         function="panel_outfits_inventory_gear_default.Custom.Action"
+         parameter="wear" />
+        <on_enable
+		 function="panel_outfits_inventory_gear_default.Enable"
+		 parameter="wear" />
+    </menu_item_call>
+    <menu_item_call
+     label="Delete Outfit"
+     layout="topleft"
+     name="delete">
+        <on_click
+         function="panel_outfits_inventory_gear_default.Custom.Action"
+         parameter="delete" />
+        <on_enable
+		 function="panel_outfits_inventory_gear_default.Enable"
+		 parameter="delete" />
+    </menu_item_call>
+</menu>
-- 
cgit v1.2.3


From aea6aa0c2b878a812e2fc4f4ca56c48099543f82 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Tue, 17 Nov 2009 20:09:39 +0200
Subject: Fixed minor bug EXT-2507 (Implement some text for empty Picks tab in
 avatar's Profile ).

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 9cfbed432a..962dad3363 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -14,7 +14,18 @@
  <string
   name="no_classifieds"
   value="No Classifieds" />
-     
+ <text
+  type="string"
+  follows="all"
+  height="535"
+  layout="topleft"
+  left="6"
+  name="empty_picks_panel_text"
+  top="10"
+  visible="false" 
+  width="313">
+   There are no any picks/classifieds here
+ </text>
  <accordion
   follows="all"
   height="465"
-- 
cgit v1.2.3


From 66979d26bb5c93bbf2470f5c0a4d5e794fdd64f6 Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Wed, 18 Nov 2009 02:15:38 +0800
Subject: L10N: linguistic improvements to some tooltips in floater_tools.xml

---
 indra/newview/skins/default/xui/en/floater_tools.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index b2f46bc433..bfbfe7de7c 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -269,6 +269,7 @@
    halign="left"
    left="13"
    name="RenderingCost"
+   tool_tip="Shows the rendering cost calculated for this object"
    top_pad="9"
    type="string"
    width="100">
@@ -306,6 +307,7 @@
      layout="topleft"
      follows="left|top"
      name="combobox grid mode"
+     tool_tip="Choose the type of grid ruler for positioning the object"
      width="108">
         <combo_box.item
          label="World grid"
@@ -329,7 +331,7 @@
      image_unselected="ForwardArrow_Off"
      layout="topleft"
      name="Options..."
-     tool_tip="Grid options"
+     tool_tip="See more grid options"
      top_delta="0"
      right="-10"
      width="18"
@@ -786,7 +788,7 @@
             </panel.string>
             <panel.string
              name="text modify warning">
-                This object has linked parts
+                You must select entire object to set permissions
             </panel.string>
             <panel.string
              name="Cost Default">
@@ -1074,7 +1076,7 @@ even though the user gets a free copy.
              follows="left|top|right"
              layout="topleft"
              name="perm_modify"
-             width="250">
+             width="264">
                 You can modify this object
             </text>
             <text
-- 
cgit v1.2.3


From 7edbb53b91ecf590632bac2f28aadda8a02a8a13 Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Wed, 18 Nov 2009 02:33:08 +0800
Subject: L10N: use consistent wording in strings.xml for Away/NotAway and
 Busy/NotBusy

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 761c17cfd2..a5272d1883 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1747,10 +1747,10 @@ Clears (deletes) the media and all params from the given face.
   </string>
 
   <!-- Avatar busy/away mode -->
-	<string name="AvatarSetNotAway">Set Not Away</string>
-	<string name="AvatarSetAway">Set Away</string>
-	<string name="AvatarSetNotBusy">Set Not Busy</string>
-	<string name="AvatarSetBusy">Set Busy</string>
+	<string name="AvatarSetNotAway">Not Away</string>
+	<string name="AvatarSetAway">Away</string>
+	<string name="AvatarSetNotBusy">Not Busy</string>
+	<string name="AvatarSetBusy">Busy</string>
 	
 	<!-- Wearable Types -->
 	<string name="shape">Shape</string>
-- 
cgit v1.2.3


From d6bbc652def68b5b8b67ef4049a1250aefdde7cb Mon Sep 17 00:00:00 2001
From: Ramzi Linden <ramzi@lindenlab.com>
Date: Wed, 18 Nov 2009 02:53:44 +0800
Subject: L10N: fix a typo in a localized label

---
 indra/newview/skins/default/xui/en/panel_preferences_sound.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_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index d454b9e5c8..8ef2cdfc37 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -350,7 +350,7 @@
      border="false"
      follows="top|left"
      height="145"
-     label="DeviceSettings"
+     label="Device Settings"
      layout="topleft"
      left="0"
      name="device_settings_panel"
-- 
cgit v1.2.3


From c76ab6c4b7384e34a4f32f2fa820b46f6373cdc3 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Tue, 17 Nov 2009 22:17:34 +0200
Subject: Fixed normal bug EXT-2108 (Home panel isn't resized).

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_sidetray_home_tab.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
index 566fc95230..9839075862 100644
--- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
@@ -7,6 +7,24 @@
  layout="topleft"
  name="home_tab"
  width="333">
+  <scroll_container
+   color="DkGray"
+   follows="all"
+   layout="topleft"
+   left="0"
+   name="profile_scroll"
+   opaque="true"
+   height="560"
+   width="333"
+   top="0">
+  <panel
+   background_visible="true"
+   height="560"
+   layout="topleft"
+   name="profile_scroll_panel"
+   top="0"
+   left="0"
+   width="311">
     <panel
      background_visible="true"
      bg_alpha_color="DkGray2"
@@ -242,4 +260,6 @@
             Browse your inventory.
         </text>
     </panel>
+  </panel>
+  </scroll_container>
 </panel>
-- 
cgit v1.2.3


From 315276a309d887b583c117b5bcb998016aed5977 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Tue, 17 Nov 2009 17:30:27 -0500
Subject: Trivial .xml change to remove no-longer-used xui panel argument
 ("hide_top_panel").

---
 indra/newview/skins/default/xui/en/floater_inventory.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml
index b48c962413..dca1692e4a 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory.xml
@@ -30,13 +30,12 @@
      name="Fetched">
         Fetched
     </floater.string>
-<panel
+    <panel
      bottom="560"
 	 class="panel_main_inventory"
 	 filename="panel_main_inventory.xml"
 	 follows="all"
 	 layout="topleft"
-	 hide_top_panel="true"
 	 left="0"
 	 label="Inventory Panel"
 	 name="Inventory Panel"
-- 
cgit v1.2.3