From 047b74c4f4727c41ae1086d18a12a9cf5aad5fce Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Thu, 22 Jul 2010 17:46:47 +0100
Subject: EXT-8248 FIXED Can't teleport multiple friends

---
 .../skins/default/xui/en/menu_people_nearby_multiselect.xml      | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
index 588342595e..5d58a9d289 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
@@ -57,4 +57,13 @@
         <on_click
          function="Avatar.Pay" />
     </menu_item_call>
+    <menu_item_call
+    label="Offer Teleport"
+    name="teleport">
+      <menu_item_call.on_click
+       function="Avatar.OfferTeleport"/>
+      <menu_item_call.on_enable
+      function="Avatar.EnableItem"
+      parameter="can_offer_teleport"/>
+    </menu_item_call>
 </context_menu>
-- 
cgit v1.2.3


From 2b5cfc2a4d887e2ac354a7ba98e9dae50c1cc2ed Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Wed, 1 Sep 2010 14:14:35 +0100
Subject: VWR-13221 (SNOW-188) FIXED Allow panning of the minimap

Imported from Snowglobe.
---
 indra/newview/skins/default/xui/en/floater_map.xml | 38 ++--------------------
 .../newview/skins/default/xui/en/menu_mini_map.xml | 10 ++++++
 2 files changed, 13 insertions(+), 35 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml
index efd96624ab..5495e11015 100644
--- a/indra/newview/skins/default/xui/en/floater_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_map.xml
@@ -7,8 +7,8 @@
  follows="top|right"
  height="174"
  layout="topleft"
- min_height="174"
- min_width="174"
+ min_height="128"
+ min_width="128"
  name="Map"
  title=""
  help_topic="map"
@@ -18,41 +18,9 @@
  left="0"
  top="0"
  width="200">
-    <floater.string
-     name="mini_map_north">
-        N
-    </floater.string>
-    <floater.string
-     name="mini_map_east">
-        E
-    </floater.string>
-    <floater.string
-     name="mini_map_west">
-        W
-    </floater.string>
-    <floater.string
-     name="mini_map_south">
-        S
-    </floater.string>
-    <floater.string
-     name="mini_map_southeast">
-        SE
-    </floater.string>
-    <floater.string
-     name="mini_map_northeast">
-        NE
-    </floater.string>
-    <floater.string
-     name="mini_map_southwest">
-        SW
-    </floater.string>
-    <floater.string
-     name="mini_map_northwest">
-        NW
-    </floater.string>
     <floater.string
      name="ToolTipMsg">
-        [AGENT][REGION](Double-click to open Map)
+        [AGENT][REGION](Double-click to open Map, shift-drag to pan)
     </floater.string>
     <floater.string name="mini_map_caption">
 	MINIMAP
diff --git a/indra/newview/skins/default/xui/en/menu_mini_map.xml b/indra/newview/skins/default/xui/en/menu_mini_map.xml
index f5ea3e735b..8fe89d3934 100644
--- a/indra/newview/skins/default/xui/en/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/en/menu_mini_map.xml
@@ -29,6 +29,7 @@
          function="Minimap.Zoom"
          parameter="far" />
     </menu_item_call>
+    <menu_item_separator />
     <menu_item_check
        label="Rotate Map"
        name="Rotate Map">
@@ -38,6 +39,15 @@
              function="ToggleControl"
              parameter="MiniMapRotate" />
     </menu_item_check>
+    <menu_item_check
+       label="Auto Center"
+       name="Auto Center">
+          <menu_item_check.on_check
+             control="MiniMapAutoCenter" />
+          <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="MiniMapAutoCenter" />
+    </menu_item_check>
     <menu_item_separator />
     <menu_item_call
      label="Stop Tracking"
-- 
cgit v1.2.3


From a330399082b06ff8d5cbaa3a6f53d7ed748571ef Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Wed, 1 Sep 2010 14:22:38 +0100
Subject: VWR-17653 (SNOW-734) FIXED Show inspectors for avatars on the MiniMap

Imported from Snowglobe.
---
 indra/newview/skins/default/xui/en/floater_map.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml
index 5495e11015..6370ff9243 100644
--- a/indra/newview/skins/default/xui/en/floater_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_map.xml
@@ -20,7 +20,7 @@
  width="200">
     <floater.string
      name="ToolTipMsg">
-        [AGENT][REGION](Double-click to open Map, shift-drag to pan)
+        [REGION](Double-click to open Map, shift-drag to pan)
     </floater.string>
     <floater.string name="mini_map_caption">
 	MINIMAP
-- 
cgit v1.2.3


From 4020b91ec6e8ab4994969ddda37f5ebbd9985367 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Wed, 1 Sep 2010 21:11:25 +0300
Subject: VWR-21127 WIP Implemented saving position and dimensions of detached
 sidebar tabs.

Reviewed by Sergey Litovchuk.
---
 indra/newview/skins/default/xui/en/floater_side_bar_tab.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml b/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml
index 1466c2d2a5..35df6a37f6 100644
--- a/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml
+++ b/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <floater
  can_close="false"
- can_resize="true">
+ can_resize="true"
+ save_rect="true"
+ >
 </floater>
-- 
cgit v1.2.3


From c2935e40a6966f47ebd87705dd730ab0960e2b6d Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Thu, 2 Sep 2010 20:13:25 +0300
Subject: VWR-20696 ADDITIONAL FIX Fix dock/undock button image changing
 depending on tab state.

---
 .../skins/default/xui/en/panel_side_tray_tab_caption.xml  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
index 60c2e0830c..349b625cef 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
@@ -22,6 +22,18 @@
      <button
      follows="right|top"
      height="16"
+     image_selected="tearoffbox.tga"
+     image_unselected="tearoffbox.tga"
+     image_disabled="tearoff_pressed.tga"
+     layout="topleft"
+     name="undock"
+     top="10"
+     right="-28"
+     width="16"
+     tool_tip="Undock" />
+     <button
+     follows="right|top"
+     height="16"
      image_selected="Icon_Dock_Press"
      image_unselected="Icon_Dock_Foreground"
      image_disabled="Icon_Dock_Press"
@@ -30,7 +42,8 @@
      top="10"
      right="-28"
      width="16"
-     tool_tip="Dock/Undock tab" />
+     tool_tip="Dock"
+     visible="false" />
      <button
      follows="right|top"
      height="16"
-- 
cgit v1.2.3


From 785de381de313673fa38e86d9df10599aa22d03b Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Fri, 3 Sep 2010 00:32:26 +0300
Subject: VWR-21127 FIXED Implemented restoring sidebar tabs that were detached
 in previous session.

It is now possible to detach some sidebar tabs, exit the viewer, login again and see those tabs still detached.
Also fixed incorrect saving of tabs dimensions implemented in the previous commit (766d6e749836).

Reviewed by Sergey Litovchuk
---
 indra/newview/skins/default/xui/en/floater_side_bar_tab.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml b/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml
index 35df6a37f6..9ec3410afd 100644
--- a/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml
+++ b/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml
@@ -3,5 +3,6 @@
  can_close="false"
  can_resize="true"
  save_rect="true"
+ save_visibility="true"
  >
 </floater>
-- 
cgit v1.2.3


From 5342df443420e70d3ee90e28781e3cd8013a059c Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Fri, 3 Sep 2010 21:35:23 +0300
Subject: VWR-21585 WIP Added support of horizontal resizing for Home, Me,
 People and Places tabs

---
 .../skins/default/xui/en/panel_classified_info.xml |  96 ++++--
 .../skins/default/xui/en/panel_edit_classified.xml |  70 +++-
 .../skins/default/xui/en/panel_edit_pick.xml       |  71 +++-
 .../skins/default/xui/en/panel_edit_profile.xml    |  71 +++-
 .../default/xui/en/panel_group_info_sidetray.xml   | 158 ++++++---
 .../skins/default/xui/en/panel_landmarks.xml       | 137 +++++---
 .../skins/default/xui/en/panel_my_profile.xml      |   2 +-
 indra/newview/skins/default/xui/en/panel_notes.xml | 171 +++++++---
 .../newview/skins/default/xui/en/panel_people.xml  | 373 ++++++++++++++++-----
 .../skins/default/xui/en/panel_pick_info.xml       |  95 ++++--
 indra/newview/skins/default/xui/en/panel_picks.xml | 223 +++++++-----
 .../skins/default/xui/en/panel_place_profile.xml   |   2 +-
 .../newview/skins/default/xui/en/panel_places.xml  | 360 ++++++++++++++++----
 .../newview/skins/default/xui/en/panel_profile.xml | 183 ++++++----
 .../skins/default/xui/en/panel_profile_view.xml    |   2 +-
 .../default/xui/en/panel_side_tray_tab_caption.xml |   2 +-
 .../default/xui/en/panel_teleport_history.xml      |   2 +-
 17 files changed, 1475 insertions(+), 543 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml
index 268cb4e5f9..0fb7691ee7 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -39,7 +39,7 @@
     Disabled
  </panel.string>
     <button
-     follows="top|right"
+     follows="top|left"
      height="24"
      image_hover_unselected="BackButton_Over"
      image_pressed="BackButton_Press"
@@ -398,30 +398,74 @@
      top_pad="5"
      left="9"
      name="buttons">
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Teleport"
-         layout="topleft"
-         left="0"
-         name="teleport_btn"
-         top="0"
-         width="101" />
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Map"
-         layout="topleft"
-         left_pad="3"
-         name="show_on_map_btn"
-         width="100" />
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Edit"
-         layout="topleft"
-         name="edit_btn"
-         left_pad="3"
-         width="101" />
+     	
+     	<layout_stack
+		  follows="bottom|left|right"
+		  height="23"
+		  layout="topleft"
+		  name="layout_stack1"
+		  left="0"
+		  orientation="horizontal"
+		  top_pad="0"
+		  width="309">
+		  
+		  <layout_panel
+			  follows="bottom|left|right"
+			  height="23"
+			  layout="bottomleft"
+			  left="0"
+			  name="layout_panel1"
+		      user_resize="false" 
+		      auto_resize="true"
+			  width="101">
+			  <button
+		         follows="bottom|left|right"
+		         height="23"
+		         label="Teleport"
+		         layout="topleft"
+		         left="0"
+		         name="teleport_btn"
+		         top="0"
+		         width="101" />	
+		  </layout_panel>
+		  
+		  <layout_panel
+			  follows="bottom|left|right"
+			  height="23"
+			  layout="bottomleft"
+			  left_pad="3"
+			  name="show_on_map_btn_lp"
+		      user_resize="false" 
+		      auto_resize="true"
+			  width="100">
+			  <button
+		         follows="bottom|left|right"
+		         height="23"
+		         label="Map"
+		         layout="topleft"
+		         name="show_on_map_btn"
+		         top="0"
+		         width="100" />
+		  </layout_panel>	  
+		  
+		  <layout_panel
+			  follows="bottom|left|right"
+			  height="23"
+			  layout="bottomleft"
+			  left_pad="3"
+			  name="edit_btn_lp"
+		      user_resize="false" 
+		      auto_resize="true"
+			  width="101">
+			  <button
+		         follows="bottom|left|right"
+		         height="23"
+		         label="Edit"
+		         layout="topleft"
+		         name="edit_btn"
+		         top="0"
+		         width="101" />
+		  </layout_panel>
+	   </layout_stack>
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
index a5c74b08e7..722715bdb9 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -23,7 +23,7 @@
   Save
  </string>
   <button
-     follows="top|right"
+     follows="top|left"
      height="24"
      image_hover_unselected="BackButton_Over"
      image_pressed="BackButton_Press"
@@ -301,22 +301,56 @@
      name="bottom_panel"
      top_pad="5"
      width="303">
-        <button
-         follows="bottom|left"
-         height="23"
-         label="[LABEL]"
-         layout="topleft"
-         name="save_changes_btn"
-         left="0"
-         top="0"
-         width="152" />
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Cancel"
-         layout="topleft"
-         name="cancel_btn"
-         left_pad="3"
-         width="153" />
+     
+         <layout_stack
+		  follows="bottom|left|right"
+		  height="23"
+		  layout="topleft"
+		  name="bottom_panel_ls"
+		  left="1"
+		  orientation="horizontal"
+		  top_pad="0"
+		  width="309">
+		  
+		  <layout_panel
+			  follows="bottom|left|right"
+			  height="23"
+			  layout="bottomleft"
+			  left="0"
+			  name="save_changes_btn_lp"
+		      user_resize="false" 
+		      auto_resize="true"
+			  width="156">
+			  <button
+		         follows="bottom|left|right"
+		         height="23"
+		         label="[LABEL]"
+		         layout="topleft"
+		         name="save_changes_btn"
+		         left="1"
+		         top="0"
+		         width="155" />	
+		  </layout_panel>
+		  
+		  <layout_panel
+			  follows="bottom|left|right"
+			  height="23"
+			  layout="bottomleft"
+			  left_pad="3"
+			  name="show_on_map_btn_lp"
+		      user_resize="false" 
+		      auto_resize="true"
+			  width="157">
+			  <button
+		         follows="bottom|left|right"
+		         height="23"
+		         label="Cancel"
+		         layout="topleft"
+		         name="cancel_btn"
+		         left="1"
+		         top="0"
+		         width="156" />
+		  </layout_panel>
+	   </layout_stack>
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index f50e182313..c4b831b71c 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -17,7 +17,7 @@
     (will update after save)
  </panel.string>
   <button
-     follows="top|right"
+     follows="top|left"
      height="24"
      image_hover_unselected="BackButton_Over"
      image_pressed="BackButton_Press"
@@ -183,22 +183,57 @@
      name="bottom_panel"
      top_pad="5"
      width="303">
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Save Pick"
-         layout="topleft"
-         name="save_changes_btn"
-         left="0"
-         top="0"
-         width="152" />
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Cancel"
-         layout="topleft"
-         name="cancel_btn"
-         left_pad="3"
-        width="153" />
+     
+     	 <layout_stack
+		  follows="bottom|left|right"
+		  height="23"
+		  layout="topleft"
+		  name="layout_stack1"
+		  left="2"
+		  orientation="horizontal"
+		  top_pad="0"
+		  width="303">
+		  	 
+		  	 <layout_panel
+			  follows="bottom|left|right"
+			  height="23"
+			  layout="topleft"
+			  left="0"
+			  name="layout_panel1"
+		      user_resize="false" 
+		      auto_resize="true"
+			  width="150">
+		        <button
+		         follows="bottom|left|right"
+		         height="23"
+		         label="Save Pick"
+		         layout="topleft"
+		         name="save_changes_btn"
+		         top="0"
+		         left="1"
+		         width="149" />
+			  </layout_panel>
+			  
+			 <layout_panel
+			  follows="bottom|left|right"
+			  height="23"
+			  layout="topleft"
+			  left_pad="4"
+			  name="layout_panel1"
+		      user_resize="false" 
+		      auto_resize="true"
+			  width="150">
+		        <button
+		         follows="bottom|left|right"
+		         height="23"
+		         label="Cancel"
+		         layout="topleft"
+		         name="cancel_btn"
+		         top="0"
+		         left="1"
+		        width="149" />
+			  </layout_panel>
+	</layout_stack>
+		  
     </panel>
 </panel>
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 5072ec3a66..8715a3a7a8 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -325,28 +325,63 @@
     </panel>
     </scroll_container>
     <panel
-       follows="bottom|left"
+       follows="bottom|left|right"
        height="28"
        left="0"
        name="profile_me_buttons_panel"
        top_pad="0"
        width="313">
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Save Changes"
-         layout="topleft"
-         left="8"
-         name="save_btn"
-         top="5"
-         width="152" />
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Cancel"
-         layout="topleft"
-         left_pad="3"
-         name="cancel_btn"
-         width="153" />
+       
+         <layout_stack
+		  follows="bottom|left|right"
+		  height="28"
+		  layout="topleft"
+		  name="bottom_panel_ls"
+		  left="7"
+		  orientation="horizontal"
+		  top_pad="0"
+		  width="295">
+		  
+		  <layout_panel
+			  follows="bottom|left|right"
+			  height="23"
+			  layout="bottomleft"
+			  name="save_changes_btn_lp"
+			  top="0"
+		      user_resize="false" 
+		      auto_resize="true"
+			  width="153">
+			<button
+		         follows="bottom|left|right"
+		         height="23"
+		         label="Save Changes"
+		         layout="topleft"
+		         left="1"
+		         name="save_btn"
+		         top="0"
+		         width="152" />
+		  </layout_panel>
+		  
+		  <layout_panel
+			  follows="bottom|left|right"
+			  height="23"
+			  layout="bottomleft"
+			  left_pad="3"
+			  name="show_on_map_btn_lp"
+			  top="0"
+		      user_resize="false" 
+		      auto_resize="true"
+			  width="154">
+	        <button
+		         follows="bottom|left|right"
+		         height="23"
+		         label="Cancel"
+		         layout="topleft"
+		         left="1"
+		         name="cancel_btn"
+		         top="0"
+		         width="153" />
+		  </layout_panel>
+	   </layout_stack>
     </panel>
 </panel>
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 4998322d62..eb02d4104b 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
@@ -183,51 +183,121 @@ background_visible="true"
          left="0"
          top_pad="0"
    name="button_row"
-   follows="bottom|left"
+   follows="bottom|left|right"
    width="313">
-   <button
-    follows="bottom|left"
-     height="23"
-     image_overlay="Refresh_Off"
-     layout="topleft"
-     left="0"
-     top="5"
-     name="btn_refresh"
-     width="23" />
-     <button
-      follows="bottom|left"
-     label="Chat"
-     name="btn_chat"
-     left_pad="3"     
-     height="23"
-     width="82" />
-     <button
-         follows="bottom|left"
-         left_pad="3"
-         height="23"
-     name="btn_call"
-     label="Group Call"
-         layout="topleft"
-         tool_tip="Call this group"
-         width="112" />
-     <button
-     follows="bottom|left"
-     height="23"
-     label="Save"
-     label_selected="Save"
-     name="btn_apply"
-     left_pad="3"
-     width="82" />
-    <button
-    follows="bottom|left"
-                 height="23"
-                 layout="topleft"
-                 left="0"
-                 label="Create Group"
-     name="btn_create"
-               visible="true"
-                 tool_tip="Create a new Group"
-                 width="103" />
+   
+   		   <layout_stack
+	     	follows="bottom|left|right"
+			height="25"
+			layout="topleft"
+			name="button_row_ls"
+			left="2"
+			orientation="horizontal"
+			top_pad="5"
+			width="309">
+	
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left="0"
+				name="btn_refresh_lp"
+			    user_resize="false" 
+			    auto_resize="true"
+				width="24">
+					<button
+				     follows="bottom|left|right"
+				     height="23"
+				     image_overlay="Refresh_Off"
+				     layout="topleft"
+				     left="1"
+				     top="0"
+				     name="btn_refresh"
+				     width="23" />
+				</layout_panel>
+				
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="btn_chat_lp"
+			    user_resize="false" 
+			    auto_resize="true"
+				width="83">
+					<button
+				     follows="bottom|left|right"
+				     label="Chat"
+				     name="btn_chat"
+				     left="1"     
+				     height="23"
+				     top="0"
+				     width="82" />		
+				</layout_panel>
+				
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="call_btn_lp"
+			    user_resize="false" 
+			    auto_resize="true"
+				width="113">
+					<button
+			         follows="bottom|left|right"
+			         left="1"
+			         height="23"
+				     name="btn_call"
+				     label="Group Call"
+			         layout="topleft"
+			         tool_tip="Call this group"
+			         top="0"
+			         width="112" />		
+				</layout_panel>
+				
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="btn_apply_lp"
+			    user_resize="false" 
+			    auto_resize="true"
+				width="83">
+					<button
+				     follows="bottom|left|right"
+				     height="23"
+				     label="Save"
+				     label_selected="Save"
+				     name="btn_apply"
+				     left="1"
+				     top="0"
+				     width="82" />
+				</layout_panel>
+				
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="btn_create_lp"
+			    user_resize="false" 
+			    auto_resize="true"
+				width="104">
+					<button
+    				 follows="bottom|left|right"
+	                 height="23"
+	                 layout="topleft"
+	                 left="1"
+	                 top="0"
+	                 label="Create Group"
+     				 name="btn_create"
+               		 visible="true"
+                 	 tool_tip="Create a new Group"
+                 	 width="103" />	
+				</layout_panel>
+		</layout_stack>
    <!--<button
      left_pad="3"
      height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index a7e87f2a1e..7e415f45a4 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -97,51 +97,94 @@
      left="3"
      name="bottom_panel"
      width="313">
-        <button
-         follows="bottom|left"
-         tool_tip="Show additional options"
-         height="25"
-         image_hover_unselected="Toolbar_Left_Over"
-         image_overlay="OptionsMenu_Off"
-         image_selected="Toolbar_Left_Selected"
-         image_unselected="Toolbar_Left_Off"
-         layout="topleft"
-         left="0"
-         name="options_gear_btn"
-         top="1"
-         width="31" />
-        <button
-         follows="bottom|left"
-         height="25"
-         image_hover_unselected="Toolbar_Middle_Over"
-         image_overlay="AddItem_Off"
-         image_selected="Toolbar_Middle_Selected"
-         image_unselected="Toolbar_Middle_Off"
-         layout="topleft"
-         left_pad="1"
-         name="add_btn"
-         tool_tip="Add new landmark"
-         width="31" />
-        <icon
-         follows="bottom|left"
-         height="25"
-         image_name="Toolbar_Middle_Off"
-         layout="topleft"
-         left_pad="1"
-         name="dummy_icon"
-         width="209"
-         />
-        <dnd_button
-         follows="bottom|left"
-         height="25"
-         image_hover_unselected="Toolbar_Right_Over"
-         image_overlay="TrashItem_Off"
-         image_selected="Toolbar_Right_Selected"
-         image_unselected="Toolbar_Right_Off"
-         layout="topleft"
-         left_pad="1"
-         name="trash_btn"
-         tool_tip="Remove selected landmark"
-         width="31" />
-    </panel>
+     	
+     	  <layout_stack
+		   animate="false"
+		   border_size="0"
+		   follows="left|right|bottom"
+		   height="25"
+		   layout="topleft"
+		   orientation="horizontal"
+		   top_pad="1"
+		   left="0"
+		   name="bottom_panel"
+		   width="307">
+		      <layout_panel
+		       auto_resize="false"
+		       height="25"
+		       layout="topleft"
+		       name="options_gear_btn_panel"
+		       width="32">
+		          <button
+		           follows="bottom|left"
+		           tool_tip="Show additional options"
+		           height="25"
+		           image_hover_unselected="Toolbar_Left_Over"
+		           image_overlay="OptionsMenu_Off"
+		           image_selected="Toolbar_Left_Selected"
+		           image_unselected="Toolbar_Left_Off"
+		           layout="topleft"
+		           left="0"
+		           name="options_gear_btn"
+		           top="0"
+		           width="31" />
+		      </layout_panel>
+		      <layout_panel
+		       auto_resize="false"
+		       height="25"
+		       layout="topleft"
+		       name="add_btn_panel"
+		       width="32">
+		          <button
+		           follows="bottom|left"
+		           height="25"
+		           image_hover_unselected="Toolbar_Middle_Over"
+		           image_overlay="AddItem_Off"
+		           image_selected="Toolbar_Middle_Selected"
+		           image_unselected="Toolbar_Middle_Off"
+		           layout="topleft"
+		           left="0"
+		           name="add_btn"
+		           tool_tip="Add new landmark"
+		           top="0"
+		           width="31" />
+		      </layout_panel>
+		      <layout_panel
+		       auto_resize="true"
+		       height="25"
+		       layout="topleft"
+		       name="dummy_panel"
+		       width="212">
+		          <icon
+		           follows="bottom|left|right"
+		           height="25"
+		           image_name="Toolbar_Middle_Off"
+		           layout="topleft"
+		           left="0"
+		           top="0"
+		           name="dummy_icon"
+		           width="211" />
+		      </layout_panel>
+		      <layout_panel
+		       auto_resize="false"
+		       height="25"
+		       layout="topleft"
+		       name="trash_btn_panel"
+		       width="31">
+		          <dnd_button
+		           follows="bottom|left"
+		           height="25"
+		           image_hover_unselected="Toolbar_Right_Over"
+		           image_overlay="TrashItem_Off"
+		           image_selected="Toolbar_Right_Selected"
+		           image_unselected="Toolbar_Right_Off"
+		           left="0"
+		           layout="topleft"
+		           name="trash_btn"
+		           tool_tip="Remove selected landmark"
+		           top="0"
+		           width="31"/>
+		      </layout_panel>
+  	</layout_stack>
+   </panel>
 </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 4629bb9cfe..684d38146a 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -392,7 +392,7 @@
      height="28"
      width="315">
         <button
-         follows="bottom|right"
+         follows="bottom"
          height="23"
          left="6"
 	 top="1"
diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml
index cff7b51ce8..530e191952 100644
--- a/indra/newview/skins/default/xui/en/panel_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_notes.xml
@@ -112,58 +112,125 @@
          name="notes_buttons_panel"
          auto_resize="false"
          width="313">
-       <button
-         follows="bottom|left"
-         height="23"
-         label="Add Friend"
-         layout="topleft"
-         left="2"
-         mouse_opaque="false"
-         name="add_friend"
-         tool_tip="Offer friendship to the Resident"
-         top="5"
-         width="80" />
-        <button
-         follows="bottom|left"
-         height="23"
-         label="IM"
-         layout="topleft"
-         name="im"
-         tool_tip="Open instant message session"
-         top="5"
-         left_pad="3"
-         width="45" />
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Call"
-         layout="topleft"
-         name="call"
-         tool_tip="Call this Resident"
-         left_pad="3"
-         top="5"
-         width="46" />
-        <button
-         enabled="false"
-         follows="bottom|left"
-         height="23"
-         label="Map"
-         layout="topleft"
-         name="show_on_map_btn"
-         tool_tip="Show the Resident on the map"
-         top="5"
-         left_pad="3"
-         width="45" />
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Teleport"
-         layout="topleft"
-         name="teleport"
-         tool_tip="Offer teleport"
-         left_pad="3"
-         top="5"
-         width="80" />
+         
+         <layout_stack
+	     	follows="bottom|left|right"
+			height="23"
+			layout="topleft"
+			name="bottom_bar_ls"
+			left="2"
+			orientation="horizontal"
+			top_pad="5"
+			width="309">
+	
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left="0"
+				name="add_friend_btn_lp"
+			    user_resize="false" 
+			    auto_resize="true"
+				width="118">
+					<button
+			         follows="bottom|left|right"
+			         height="23"
+			         label="Add Friend"
+			         layout="topleft"
+			         left="1"
+			         mouse_opaque="false"
+			         name="add_friend"
+			         tool_tip="Offer friendship to the Resident"
+			         top="0"
+			         width="117" />	
+				</layout_panel>
+				
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="im_btn_lp"
+			    user_resize="false" 
+			    auto_resize="true"
+				width="22">
+					<button
+			         follows="bottom|left|right"
+			         height="23"
+			         label="IM"
+			         layout="topleft"
+			         name="im"
+			         tool_tip="Open instant message session"
+			         top="0"
+			         left="1"
+			         width="21" />		
+				</layout_panel>
+				
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="call_btn_lp"
+			    user_resize="false" 
+			    auto_resize="true"
+				width="52">
+					<button
+			         follows="bottom|left|right"
+			         height="23"
+			         label="Call"
+			         layout="topleft"
+			         name="call"
+			         tool_tip="Call this Resident"
+			         left="1"
+			         top="0"
+			         use_ellipses="true"
+			         width="51" />		
+				</layout_panel>
+				
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="show_on_map_btn_lp"
+			    user_resize="false" 
+			    auto_resize="true"
+				width="46">
+					<button
+			         enabled="false"
+			         follows="bottom|left|right"
+			         height="23"
+			         label="Map"
+			         layout="topleft"
+			         name="show_on_map_btn"
+			         tool_tip="Show the Resident on the map"
+			         top="0"
+			         left="1"
+			         width="45" />
+				</layout_panel>
+				
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="teleport_btn_lp"
+			    user_resize="false" 
+			    auto_resize="true"
+				width="81">
+					<button
+			         follows="bottom|left|right"
+			         height="23"
+			         label="Teleport"
+			         layout="topleft"
+			         name="teleport"
+			         tool_tip="Offer teleport"
+			         left="1"
+			         top="0"
+			         width="80" />	
+				</layout_panel>
+		</layout_stack>     
         </layout_panel>
     </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 7cd0d5b5f0..059283ce09 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -143,7 +143,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                   function="People.addFriend" />
              </button>
              <icon
-             follows="bottom|left"
+             follows="bottom|left|right"
              height="25"
              image_name="Toolbar_Right_Off"
              layout="topleft"
@@ -222,6 +222,96 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
              name="bottom_panel"
              top_pad="0"
              width="313">
+             
+             	  <layout_stack
+				   animate="false"
+				   border_size="0"
+				   follows="left|right|bottom"
+				   height="25"
+				   layout="topleft"
+				   orientation="horizontal"
+				   top_pad="1"
+				   left="0"
+				   name="bottom_panel"
+				   width="305">
+				      <layout_panel
+				       auto_resize="false"
+				       height="25"
+				       layout="topleft"
+				       name="options_gear_btn_panel"
+				       width="32">
+				          <button
+				           follows="bottom|left"
+				           tool_tip="Show additional options"
+				           height="25"
+				           image_hover_unselected="Toolbar_Left_Over"
+				           image_overlay="OptionsMenu_Off"
+				           image_selected="Toolbar_Left_Selected"
+				           image_unselected="Toolbar_Left_Off"
+				           layout="topleft"
+				           left="0"
+				           name="friends_viewsort_btn"
+				           top="0"
+				           width="31" />
+				      </layout_panel>
+				      <layout_panel
+				       auto_resize="false"
+				       height="25"
+				       layout="topleft"
+				       name="add_btn_panel"
+				       width="32">
+				          <button
+				           follows="bottom|left"
+				           height="25"
+				           image_hover_unselected="Toolbar_Middle_Over"
+				           image_overlay="AddItem_Off"
+				           image_selected="Toolbar_Middle_Selected"
+				           image_unselected="Toolbar_Middle_Off"
+				           layout="topleft"
+				           left="0"
+				           name="add_btn"
+				           tool_tip="Offer friendship to a Resident"
+				           top="0"
+				           width="31" />
+				      </layout_panel>
+				      <layout_panel
+				       auto_resize="true"
+				       height="25"
+				       layout="topleft"
+				       name="dummy_panel"
+				       width="212">
+				          <icon
+				           follows="bottom|left|right"
+				           height="25"
+				           image_name="Toolbar_Middle_Off"
+				           layout="topleft"
+				           left="0"
+				           top="0"
+				           name="dummy_icon"
+				           width="211" />
+				      </layout_panel>
+				      <layout_panel
+				       auto_resize="false"
+				       height="25"
+				       layout="topleft"
+				       name="trash_btn_panel"
+				       width="31">
+				          <dnd_button
+				           follows="bottom|left"
+				           height="25"
+				           image_hover_unselected="Toolbar_Right_Over"
+				           image_overlay="TrashItem_Off"
+				           image_selected="Toolbar_Right_Selected"
+				           image_unselected="Toolbar_Right_Off"
+				           left="0"
+				           layout="topleft"
+				           name="trash_btn"
+				           tool_tip="Remove selected person from your Friends list"
+				           top="0"
+				           width="31"/>
+				      </layout_panel>
+				  </layout_stack><!--
+             
                <button
                follows="bottom|left"
                tool_tip="Options"
@@ -248,7 +338,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  tool_tip="Offer friendship to a Resident"
                  width="31" />
                 <icon
-             	 follows="bottom|left"
+             	 follows="bottom|left|right"
              	 height="25"
              	 image_name="Toolbar_Middle_Off"
              	 layout="topleft"
@@ -268,7 +358,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  name="del_btn"
                  tool_tip="Remove selected person from your Friends list"
                  width="31" />
-            </panel>
+            --></panel>
             <text
              follows="all"
              height="450"
@@ -353,7 +443,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                  tool_tip="Activate selected group"
                  width="31" />
                  <icon
-             	 follows="bottom|left"
+             	 follows="bottom|left|right"
              	 height="25"
              	 image_name="Toolbar_Right_Off"
              	 layout="topleft"
@@ -427,7 +517,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                    function="People.addFriend" />
               </button>
               <icon
-             	 follows="bottom|left"
+             	 follows="bottom|left|right"
              	 height="25"
              	 image_name="Toolbar_Right_Off"
              	 layout="topleft"
@@ -439,85 +529,210 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
         </panel>
     </tab_container>
     <panel
-     follows="bottom|left"
+     follows="bottom|left|right"
      height="23"
      layout="topleft"
      left="8"
      top_pad="4"
      name="button_bar"
      width="313">
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Profile"
-         layout="topleft"
-         name="view_profile_btn"
-         tool_tip="Show picture, groups, and other Residents information"
-         top="0"
-         width="67" />
-        <button
-         follows="bottom|left"
-         left_pad="3"
-         height="23"
-         label="IM"
-         layout="topleft"
-         name="im_btn"
-         tool_tip="Open instant message session"
-         width="40" />
-        <button
-         follows="bottom|left"
-         left_pad="3"
-         height="23"
-         label="Call"
-         layout="topleft"
-         name="call_btn"
-         tool_tip="Call this Resident"
-         width="51" />
-        <button
-         follows="bottom|left"
-         left_pad="3"
-         height="23"
-         label="Share"
-         layout="topleft"
-         name="share_btn"
-         tool_tip="Share an inventory item"
-         width="65" />
-        <button
-         follows="bottom|left"
-         left_pad="3"
-         height="23"
-         label="Teleport"
-         layout="topleft"
-         name="teleport_btn"
-         tool_tip="Offer teleport"
-         width="76" />
-        <button
-         follows="bottom|left"
-         left="0"
-         top_delta="0"
-         height="23"
-         label="Group Profile"
-         layout="topleft"
-         name="group_info_btn"
-         tool_tip="Show group information"
-         width="107" />
-        <button
-         follows="bottom|left"
-         left_pad="3"
-         height="23"
-         label="Group Chat"
-         layout="topleft"
-         name="chat_btn"
-         tool_tip="Open chat session"
-         width="100" />
-        <button
-         follows="bottom|left"
-         left_pad="3"
-         height="23"
-         label="Group Call"
-         layout="topleft"
-         name="group_call_btn"
-         tool_tip="Call this group"
-         width="95" />
+
+<!--********************************Profile; IM; Call, Share, Teleport********************************--> 	
+     	<layout_stack
+     	follows="bottom|left|right"
+		height="23"
+		layout="topleft"
+		name="bottom_bar_ls"
+		left="0"
+		orientation="horizontal"
+		top_pad="0"
+		width="313">
+
+			<layout_panel
+			follows="bottom|left|right"
+			height="23"
+			layout="bottomleft"
+			left="0"
+			name="view_profile_btn_lp"
+		    user_resize="false" 
+		    auto_resize="true"
+			width="68">
+				<button
+		         follows="bottom|left|right"
+		         height="23"
+		         label="Profile"
+		         layout="topleft"
+		         left="1"
+		         name="view_profile_btn"
+		         tool_tip="Show picture, groups, and other Residents information"
+		         top="0"
+		         width="67" />	
+			</layout_panel>
+			
+			<layout_panel
+			follows="bottom|left|right"
+			height="23"
+			layout="bottomleft"
+			left_pad="3"
+			name="chat_btn_lp"
+		    user_resize="false" 
+		    auto_resize="true"
+			width="41">
+				<button
+		         follows="bottom|left|right"
+		         left="1"
+		         height="23"
+		         label="IM"
+		         layout="topleft"
+		         name="im_btn"
+		         tool_tip="Open instant message session"
+		         top="0"
+		         width="40" />			
+			</layout_panel>
+			
+			<layout_panel
+			follows="bottom|left|right"
+			height="23"
+			layout="bottomleft"
+			left_pad="3"
+			name="chat_btn_lp"
+		    user_resize="false" 
+		    auto_resize="true"
+			width="52">
+				<button
+		         follows="bottom|left|right"
+		         left="1"
+		         height="23"
+		         label="Call"
+		         layout="topleft"
+		         name="call_btn"
+		         tool_tip="Call this Resident"
+		         top="0"
+		         width="51" />		
+			</layout_panel>
+			
+			<layout_panel
+			follows="bottom|left|right"
+			height="23"
+			layout="bottomleft"
+			left_pad="3"
+			name="chat_btn_lp"
+		    user_resize="false" 
+		    auto_resize="true"
+			width="66">
+				<button
+		         follows="bottom|left|right"
+		         left="1"
+		         height="23"
+		         label="Share"
+		         layout="topleft"
+		         name="share_btn"
+		         tool_tip="Share an inventory item"
+		         top="0"
+		         width="65" />	
+			</layout_panel>
+			
+			<layout_panel
+			follows="bottom|left|right"
+			height="23"
+			layout="bottomleft"
+			left_pad="3"
+			name="chat_btn_lp"
+		    user_resize="false" 
+		    auto_resize="true"
+			width="77">
+				<button
+		         follows="bottom|left|right"
+		         left="1"
+		         height="23"
+		         label="Teleport"
+		         layout="topleft"
+		         name="teleport_btn"
+		         tool_tip="Offer teleport"
+		         top="0"
+		         width="76" />		
+			</layout_panel>
+		</layout_stack>
+		
+<!--********************************Group Profile; Group Chat; Group Call buttons************************-->			
+		<layout_stack
+     	follows="bottom|left|right"
+		height="23"
+		layout="topleft"
+		mouse_opaque="false"
+		name="bottom_bar_ls1"
+		left="0"
+		orientation="horizontal"
+		top="0"
+		width="313">	
+			<layout_panel
+			follows="bottom|left|right"
+			height="23"
+			layout="bottomleft"
+			left="0"			
+			mouse_opaque="false"
+			name="group_info_btn_lp"
+		    user_resize="false" 
+		    auto_resize="true"
+			width="108">
+				<button
+		        follows="bottom|left|right"
+		        left="1"
+		        height="23"
+		        label="Group Profile"
+		        layout="topleft"
+				mouse_opaque="false"
+		        name="group_info_btn"
+		        tool_tip="Show group information"
+		        top="0"
+		        width="107" />		
+			</layout_panel>
+			
+			<layout_panel
+			follows="bottom|left|right"
+			height="23"
+			layout="bottomleft"
+			left_pad="3"
+			mouse_opaque="false"
+			name="chat_btn_lp"
+		    user_resize="false" 
+		    auto_resize="true"
+			width="101">
+				<button
+		        follows="bottom|left|right"
+		        left="1"
+		        height="23"
+		        label="Group Chat"
+		        layout="topleft"
+				mouse_opaque="false"
+		        name="chat_btn"
+		        tool_tip="Open chat session"
+		        top="0"
+		        width="100" />			
+			</layout_panel>
+		
+			<layout_panel
+			follows="bottom|left|right"
+			height="23"
+			layout="bottomleft"
+			left_pad="3"
+			mouse_opaque="false"
+			name="group_call_btn_lp"
+		    user_resize="false" 
+		    auto_resize="true"
+			width="96">
+				<button
+				follows="bottom|left|right"
+				left="1"
+				height="23"
+         		label="Group Call"
+         		layout="topleft"
+				mouse_opaque="false"
+         		name="group_call_btn"
+         		tool_tip="Call this group"
+		        top="0"
+         		width="95" />			
+			</layout_panel>		
+		</layout_stack>
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
index 95c8cb301d..0496c86215 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -11,7 +11,7 @@
  top="0"
  width="333">
     <button
-     follows="top|right"
+     follows="top|left"
      height="24"
      image_hover_unselected="BackButton_Over"
      image_pressed="BackButton_Press"
@@ -121,30 +121,73 @@
      top_pad="5"
      left="8"
      name="buttons">
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Teleport"
-         layout="topleft"
-         left="0"
-         name="teleport_btn"
-         top="0"
-         width="101" />
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Map"
-         layout="topleft"
-         left_pad="3"
-         name="show_on_map_btn"
-         width="100" />
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Edit"
-         layout="topleft"
-         name="edit_btn"
-         left_pad="3"
-         width="101" />
+       
+       <layout_stack
+		  follows="bottom|left|right"
+		  height="23"
+		  layout="topleft"
+		  name="layout_stack1"
+		  left="0"
+		  orientation="horizontal"
+		  top_pad="0"
+		  width="312">
+		  
+		  <layout_panel
+			  follows="bottom|left|right"
+			  height="23"
+			  layout="bottomleft"
+			  left="0"
+			  name="layout_panel1"
+		      user_resize="false" 
+		      auto_resize="true"
+			  width="101">
+			  <button
+			  	 follows="bottom|left|right"
+		         height="23"
+		         label="Teleport"
+		         layout="topleft"
+		         name="teleport_btn"
+		         top="0"
+		         width="101" />
+		  </layout_panel>
+		  
+		  <layout_panel
+			  follows="bottom|left|right"
+			  height="23"
+			  layout="bottomleft"
+			  left_pad="3"
+			  name="show_on_map_btn_lp"
+		      user_resize="false" 
+		      auto_resize="true"
+			  width="100">
+			  <button
+		         follows="bottom|left|right"
+		         height="23"
+		         label="Map"
+		         layout="topleft"
+		         name="show_on_map_btn"
+		         top_pad="0"
+		         width="100" />
+		  </layout_panel>	  
+		  
+		  <layout_panel
+			  follows="bottom|left|right"
+			  height="23"
+			  layout="bottomleft"
+			  left_pad="3"
+			  name="edit_btn_lp"
+		      user_resize="false" 
+		      auto_resize="true"
+			  width="101">
+			  <button
+		         follows="bottom|left|right"
+		         height="23"
+		         label="Edit"
+		         layout="topleft"
+		         name="edit_btn"
+		         top_pad="0"
+		         width="101" />
+		  </layout_panel>
+	   </layout_stack>
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index a815cdf7f0..647be28a62 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -78,93 +78,166 @@ bg_opaque_color="DkGray2"
          bevel_style="none"
          enabled="false"
          auto_resize="false"
-         follows="bottom"
+         follows="bottom|left|right"
          left="1"
          height="27"
          label="bottom_panel"
-         layout="topleft"
+         layout="bottom"
          name="edit_panel"
          top_pad="-2"
          width="313">
-            <button
-             enabled="false"
-             follows="bottom|left"
-             height="18"
-             image_selected="OptionsMenu_Press"
-             image_unselected="OptionsMenu_Off"
-              image_disabled="OptionsMenu_Disabled"
-             layout="topleft"
-             left="10"
-             name="gear_menu_btn"
-             top="9"
-             width="18" />
-            <button
-             follows="bottom|left"
-             height="18"
-             image_disabled="AddItem_Disabled"
-             image_selected="AddItem_Press"
-             image_unselected="AddItem_Off"
-             layout="topleft"
-             left_pad="15"
-             name="new_btn"
-             tool_tip="Create a new pick or classified at the current location"
-             top="9"
-             width="18" />
-            <button
-             follows="bottom|right"
-             height="18"
-             image_disabled="TrashItem_Disabled"
-             image_selected="TrashItem_Press"
-             image_unselected="TrashItem_Off"
-             layout="topleft"
-             name="trash_btn"
-             right="-10"
-             top="9"
-             width="18" />
-        </panel>
-        <panel
+         
+         <layout_stack
+		  follows="bottom|left|right"
+		  height="23"
+		  layout="bottomleft"
+		  name="edit_panel_ls"
+		  left="10"
+		  orientation="horizontal"
+		  top_pad="0"
+		  width="293">
+		  
+		  <layout_panel
+			  follows="bottom|left"
+			  height="18"
+			  layout="bottomleft"
+			  left="0"
+			  name="gear_menu_btn"
+		      user_resize="false" 
+		      auto_resize="true"
+			  width="51">
+	            <button
+	             enabled="false"
+	             follows="bottom|left"
+	             height="18"
+	             image_selected="OptionsMenu_Press"
+	             image_unselected="OptionsMenu_Off"
+	             image_disabled="OptionsMenu_Disabled"
+	             layout="topleft"
+	             left="0"
+	             name="gear_menu_btn"
+	             top_pad="0"
+	             width="18" />
+				<button
+	             follows="bottom|left"
+	             height="18"
+	             image_disabled="AddItem_Disabled"
+	             image_selected="AddItem_Press"
+	             image_unselected="AddItem_Off"
+	             layout="topleft"
+	             left_pad="15"
+	             name="new_btn"
+	             tool_tip="Create a new pick or classified at the current location"
+	             width="18" />
+		  </layout_panel>
+		  
+		  <layout_panel
+			  follows="bottom|right"
+			  height="18"
+			  layout="bottomleft"
+			  name="trash_btn_lp"
+		      user_resize="false" 
+		      auto_resize="true"
+			  width="18">
+				<button
+	             follows="bottom|right"
+	             height="18"
+	             image_disabled="TrashItem_Disabled"
+	             image_selected="TrashItem_Press"
+	             image_unselected="TrashItem_Off"
+	             layout="topleft"
+	             name="trash_btn"
+	             top="0"
+	             width="18" />
+		  </layout_panel>
+		  
+	  </layout_stack>
+	  </panel>
+	  
+	  <panel
  bg_opaque_color="DkGray"
        background_visible="true"
        background_opaque="true"
+         follows="bottom|left|right"
          layout="topleft"
          left="0"
          height="40"
-         top="502"
          name="buttons_cucks"
          width="313">
-       <button
-         enabled="false"
-         follows="bottom|left"
-         height="23"
-         label="Info"
-         layout="topleft"
-         left="2"
-         name="info_btn"
-         tab_stop="false"
-         tool_tip="Show pick information"
-         top="5"
-         width="95" />
-        <button
-         enabled="false"
-         follows="bottom|left"
-         height="23"
-         label="Teleport"
-         layout="topleft"
-         left_pad="3"
-         name="teleport_btn"
-         tab_stop="false"
-         tool_tip="Teleport to the corresponding area"
-         width="117" />
-        <button
-         enabled="false"
-         follows="bottom|left"
-         height="23"
-         label="Map"
-         layout="topleft"
-         left_pad="3"
-         name="show_on_map_btn"
-         tab_stop="false"
-         tool_tip="Show the corresponding area on the World Map"
-         width="90" />
-        </panel>
+      
+      <layout_stack
+		  follows="bottom|left|right"
+		  height="28"
+		  layout="topleft"
+		  left="2"
+		  name="buttons_cucks_ls"
+		  orientation="horizontal"
+		  top="0"
+		  width="313">
+		  	  
+		  <layout_panel
+			  follows="bottom|left|right"
+			  height="28"
+			  layout="topleft"
+			  left="0"
+			  name="info_btn_lp"
+		      user_resize="false" 
+		      auto_resize="true"
+			  top="0"
+			  width="95">
+		       <button
+		         enabled="false"
+		         follows="top|left|right"
+		         height="23"
+		         label="Info"
+		         layout="topleft"
+		         name="info_btn"
+		         tab_stop="false"
+		         tool_tip="Show pick information"
+		         width="95" />
+		  </layout_panel>
+		  
+		  <layout_panel
+			  follows="bottom|left|right"
+			  height="28"
+			  layout="bottomleft" 
+			  left_pad="2"
+			  name="teleport_btn_lp"
+		      user_resize="false" 
+		      auto_resize="true"
+			  width="117">
+		        <button
+		         enabled="false"
+		         follows="top|left|right"
+		         height="23"
+		         label="Teleport"
+		         layout="topleft"
+		         name="teleport_btn"
+		         tab_stop="false"
+		         tool_tip="Teleport to the corresponding area"
+		         width="117" />
+		  </layout_panel>
+		  
+		  <layout_panel
+			  follows="bottom|left|right"
+			  height="28"
+			  layout="bottomleft"
+			  name="show_on_map_btn_lp"
+		      user_resize="false" 
+		      auto_resize="true" 
+			  left_pad="2"
+			  width="90">
+		        <button
+		         enabled="false"
+		         follows="top|left|right"
+		         height="23"
+		         label="Map"
+		         layout="topleft"
+		         name="show_on_map_btn"
+		         tab_stop="false"
+		         tool_tip="Show the corresponding area on the World Map"
+		         width="88" />
+		  </layout_panel>
+	</layout_stack>
+	</panel>
 </panel>
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 c6e93af50a..01d1e48ba1 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -154,7 +154,7 @@
      translate="false"
      value="Parcel_DamageNo_Dark" />
     <button
-     follows="top|right"
+     follows="top|left"
      height="24"
      image_hover_unselected="BackButton_Over"
      image_pressed="BackButton_Press"
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index 638e190e8f..21314703b0 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -68,83 +68,297 @@ background_visible="true"
      visible="false"
      width="315" />
     <panel
+     follows="bottom|left|right"
      height="23"
      layout="topleft"
      left="4"
      name="button_panel"
      width="315">
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Teleport"
-         layout="topleft"
-         left="5"
-         name="teleport_btn"
-         tool_tip="Teleport to the selected area"
-         top="1"
-         width="108" />
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Map"
-         layout="topleft"
-         left_pad="3"
-         name="map_btn"
-         tool_tip="Show the corresponding area on the World Map"
-         width="85" />
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Edit"
-         layout="topleft"
-         left_pad="3"
-         name="edit_btn"
-         tool_tip="Edit landmark information"
-         width="83" />
-        <button
-         follows="bottom|right"
-         height="23"
-         label="▼"
-         layout="topleft"
-         name="overflow_btn"
-         tool_tip="Show additional options"
-         left_pad="3"
-         width="23" />
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Save"
-         layout="topleft"
-         name="save_btn"
-         left="5"
-         top_pad="-23"
-         width="152" />
-        <button
-         follows="bottom|right"
-         height="23"
-         label="Cancel"
-         layout="topleft"
-         name="cancel_btn"
-         left_pad="3"
-         width="153" />
-        <button
-         follows="bottom|right"
-         height="23"
-         label="Close"
-         layout="topleft"
-         name="close_btn"
-         right="-10"
-         top="1"
-         width="60" />
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Profile"
-         layout="topleft"
-         name="profile_btn"
-         right="-1"
-         tool_tip="Show place profile"
-         top="1"
-         width="111" />
+     
+       <layout_stack
+     	follows="bottom|left|right"
+		height="23"
+		layout="topleft"
+		mouse_opaque="false"
+		name="bottom_bar_ls0"
+		left="4"
+		orientation="horizontal"
+		top="0"
+		width="315">	
+			<layout_panel
+			follows="bottom|left|right"
+			height="23"
+			layout="bottomleft"
+			left="0"			
+			mouse_opaque="false"
+			name="lp1"
+		    user_resize="false" 
+		    auto_resize="true"
+			width="193">
+			
+		<!--*********************** Teleport, Map buttons ***********************-->
+     	
+		       <layout_stack
+		     	follows="bottom|left|right"
+				height="23"
+				layout="topleft"
+				mouse_opaque="false"
+				name="bottom_bar_ls1"
+				left="0"
+				orientation="horizontal"
+				top="0"
+				width="193">	
+					<layout_panel
+					follows="bottom|left|right"
+					height="23"
+					layout="bottomleft"
+					left="0"			
+					mouse_opaque="false"
+					name="teleport_btn_lp"
+				    user_resize="false" 
+				    auto_resize="true"
+					width="109">
+						<button
+				         follows="bottom|left|right"
+				         height="23"
+				         label="Teleport"
+				         layout="topleft"
+				         left="1"
+				         name="teleport_btn"
+				         tool_tip="Teleport to the selected area"
+				         top="0"
+				         width="108" />		
+					</layout_panel>
+					
+					<layout_panel
+					follows="bottom|left|right"
+					height="23"
+					layout="bottomleft"
+					left_pad="3"
+					mouse_opaque="false"
+					name="chat_btn_lp"
+				    user_resize="false" 
+				    auto_resize="true"
+					width="86">
+						<button
+				         follows="bottom|left|right"
+				         height="23"
+				         label="Map"
+				         layout="topleft"
+				         left="1"
+				         name="map_btn"
+				         tool_tip="Show the corresponding area on the World Map"
+				         top="0"
+				         width="85" />		
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>	
+			
+			<layout_panel
+			follows="bottom|left|right"
+			height="23"
+			layout="bottomleft"
+			left_pad="0"			
+			mouse_opaque="false"
+			name="lp2"
+		    user_resize="false" 
+		    auto_resize="true"
+			width="116">
+			
+		<!--*********************** Edit, Options buttons ***********************-->		
+		
+				<layout_stack
+		     	follows="bottom|left|right"
+				height="23"
+				layout="topleft"
+				mouse_opaque="false"
+				name="bottom_bar_ls3"
+				left="0"
+				orientation="horizontal"
+				top="0"
+				width="120">
+		
+					<layout_panel
+					follows="bottom|left|right"
+					height="23"
+					layout="bottomleft"
+					left_pad="0"
+					mouse_opaque="false"
+					name="edit_btn_lp"
+				    user_resize="false" 
+				    auto_resize="true"
+					width="84">
+						<button
+				         follows="bottom|left|right"
+				         height="23"
+				         label="Edit"
+				         layout="topleft"
+				         left="1"
+						 mouse_opaque="false"
+				         name="edit_btn"
+				         tool_tip="Edit landmark information"
+				         top="0"
+				         width="83" />
+					</layout_panel>
+					
+					<layout_panel
+					follows="bottom|left|right"
+					height="23"
+					layout="bottomleft"
+					left_pad="0"
+					mouse_opaque="false"
+					name="overflow_btn_lp"
+				    user_resize="false" 
+				    auto_resize="true"
+					width="24">
+						<button
+				         follows="bottom|left|right"
+				         height="23"
+				         label="▼"
+				         layout="topleft"
+						 mouse_opaque="false"
+				         name="overflow_btn"
+				         tool_tip="Show additional options"
+				         top="0"
+				         left="1"		         
+				         width="23" />			
+					</layout_panel>
+				</layout_stack>
+		
+		<!--*********************** Profile button ***********************-->		
+				
+				<layout_stack
+		     	follows="bottom|left|right"
+				height="23"
+				layout="topleft"
+				mouse_opaque="false"
+				name="bottom_bar_ls3"
+				left="0"
+				orientation="horizontal"
+				top="0"
+				width="120">		
+					<layout_panel
+					follows="bottom|left|right"
+					height="23"
+					layout="bottomleft"
+					left_pad="3"			
+					mouse_opaque="false"
+					name="profile_btn_lp"
+				    user_resize="false" 
+				    auto_resize="true"
+					width="112">
+						<button
+				         follows="bottom|left|right"
+				         height="23"
+				         label="Profile"
+				         layout="topleft"
+						 mouse_opaque="false"
+				         name="profile_btn"
+				         left="1"
+				         tool_tip="Show place profile"
+				         top="0"
+				         width="111" />		
+					</layout_panel>
+				</layout_stack>
+		
+		<!--*********************** Close button ***********************-->
+				
+				<layout_stack
+		     	follows="bottom|left|right"
+				height="23"
+				layout="topleft"
+				mouse_opaque="false"
+				name="bottom_bar_close_ls3"
+				left="0"
+				orientation="horizontal"
+				top="0"
+				width="120">
+					<layout_panel
+					follows="bottom|left|right"
+					height="23"
+					layout="bottomleft"
+					left_pad="3"			
+					mouse_opaque="false"
+					name="close_btn_lp"
+					top="0"
+				    user_resize="false" 
+				    auto_resize="true"
+					width="61">
+						<button
+				         follows="bottom|left|right"
+				         height="23"
+				         label="Close"
+				         layout="topleft"
+						 mouse_opaque="false"
+				         name="close_btn"
+				         left="1"
+				         top="0"
+				         width="60" />	
+					</layout_panel>
+				</layout_stack>
+
+					
+			</layout_panel>
+		</layout_stack>	
+
+<!--*********************** Save, Cancel buttons ***********************-->		
+		
+		<layout_stack
+     	follows="bottom|left|right"
+		height="23"
+		layout="topleft"
+		mouse_opaque="false"
+		name="bottom_bar_ls2"
+		left="4"
+		orientation="horizontal"
+		top="0"
+		width="313">
+		
+			<layout_panel
+			follows="bottom|left|right"
+			height="23"
+			layout="bottomleft"
+			left_pad="3"
+			mouse_opaque="false"
+			name="save_btn_lp"
+			top="0"
+		    user_resize="false" 
+		    auto_resize="true"
+			width="153">
+				<button
+		         follows="bottom|left|right"
+		         height="23"
+		         label="Save"
+		         layout="topleft"
+				 mouse_opaque="false"
+		         name="save_btn"
+		         left="1"
+		         top_pad="0"
+		         width="152"/>		
+			</layout_panel>
+			
+			<layout_panel
+			follows="bottom|left|right"
+			height="23"
+			layout="bottomleft"
+			left_pad="3"
+			mouse_opaque="false"
+			name="cancel_btn_lp"
+			top="0"
+		    user_resize="false" 
+		    auto_resize="true"
+			width="154">
+				<button
+		         follows="bottom|left|right"
+		         height="23"
+		         label="Cancel"
+		         layout="topleft"
+				 mouse_opaque="false"
+		         name="cancel_btn"
+		         left="1"
+		         top="0"
+		         width="153" />		
+			</layout_panel>		
+		</layout_stack>
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index e41b80baf2..88d7e68894 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -305,73 +305,132 @@
         </scroll_container>
       </layout_panel>
       <layout_panel
-              follows="bottom|left"
+         follows="bottom|left"
          height="30"
          layout="topleft"
          name="profile_buttons_panel"
          auto_resize="false"
          width="317">
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Add Friend"
-         layout="topleft"
-         left="2"
-         mouse_opaque="false"
-         name="add_friend"
-         pad_left="1" 
-         pad_right="1"
-         tool_tip="Offer friendship to the Resident"
-         top="5"
-         use_ellipses="true"
-         width="117" />
-        <button
-         follows="bottom|left"
-         height="23"
-         label="IM"
-         layout="topleft"
-         name="im"
-         tool_tip="Open instant message session"
-         top="5"
-         left_pad="1"
-         width="21" />
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Call"
-         layout="topleft"
-         name="call"
-         tool_tip="Call this Resident"
-         left_pad="1"
-         pad_left="1" 
-         pad_right="1"
-         top="5"
-         use_ellipses="true"
-         width="51" />
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Teleport"
-         layout="topleft"
-         name="teleport"
-         tool_tip="Offer teleport"
-         left_pad="1"
-         pad_left="1" 
-         pad_right="1"
-         top="5"
-         use_ellipses="true"
-         width="92" />
-        <button
-         follows="bottom|right"
-         height="23"
-         label="▼"
-         layout="topleft"
-         name="overflow_btn"
-         tool_tip="Pay money to or share inventory with the Resident"
-         right="-1"
-         top="5"
-         width="23" />
-        </layout_panel>
+         	
+           <layout_stack
+	     	follows="bottom|left|right"
+			height="23"
+			layout="topleft"
+			name="bottom_bar_ls"
+			left="0"
+			orientation="horizontal"
+			top_pad="5"
+			width="317">
+	
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left="0"
+				name="add_friend_btn_lp"
+			    user_resize="false" 
+			    auto_resize="true"
+				width="118">
+					<button
+			         follows="bottom|left|right"
+			         height="23"
+			         label="Add Friend"
+			         layout="topleft"
+			         left="1"
+			         mouse_opaque="false"
+			         name="add_friend"
+			         tool_tip="Offer friendship to the Resident"
+			         top="0"
+			         width="117" />	
+				</layout_panel>
+				
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="im_btn_lp"
+			    user_resize="false" 
+			    auto_resize="true"
+				width="22">
+					<button
+			         follows="bottom|left|right"
+			         height="23"
+			         label="IM"
+			         layout="topleft"
+			         name="im"
+			         tool_tip="Open instant message session"
+			         top="0"
+			         left="1"
+			         width="21" />		
+				</layout_panel>
+				
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="call_btn_lp"
+			    user_resize="false" 
+			    auto_resize="true"
+				width="52">
+					<button
+			         follows="bottom|left|right"
+			         height="23"
+			         label="Call"
+			         layout="topleft"
+			         name="call"
+			         tool_tip="Call this Resident"
+			         left="1"
+			         top="0"
+			         use_ellipses="true"
+			         width="51" />		
+				</layout_panel>
+				
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="chat_btn_lp"
+			    user_resize="false" 
+			    auto_resize="true"
+				width="93">
+					<button
+			         follows="bottom|left|right"
+			         height="23"
+			         label="Teleport"
+			         layout="topleft"
+			         name="teleport"
+			         tool_tip="Offer teleport"
+			         left="1"
+			         top="0"
+			         use_ellipses="true"
+			         width="92" />
+				</layout_panel>
+				
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="overflow_btn_lp"
+			    user_resize="false" 
+			    auto_resize="true"
+				width="27">
+					<button
+			         follows="bottom|left|right"
+			         height="23"
+			         label="▼"
+			         layout="topleft"
+			         name="overflow_btn"
+			         tool_tip="Pay money to or share inventory with the Resident"
+			         left="1"
+			         top="0"
+			         width="23" />		
+				</layout_panel>
+		</layout_stack>
+      </layout_panel>
       <layout_panel
          follows="bottom|left"
          height="30"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index d9030fc0d6..41c7b95c9f 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -17,7 +17,7 @@
         Offline
     </string>
     <button
-     follows="top|right"
+     follows="top|left"
      height="24"
      image_hover_unselected="BackButton_Over"
      image_pressed="BackButton_Press"
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
index 349b625cef..58112306d8 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
@@ -9,7 +9,7 @@
  left="0"
  name="sidetray_tab_panel">
     <text
-     follows="left|top"
+     follows="left|top|right"
      font="SansSerifHuge"
      height="16"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
index b48c5d1f8a..bf09836e87 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
@@ -171,7 +171,7 @@
          top="1"
          width="31" />
         <icon
-         follows="bottom|left"
+         follows="bottom|left|right"
          height="25"
          image_name="Toolbar_Right_Off"
          layout="topleft"
-- 
cgit v1.2.3


From 3a07996af1d45f6b763d5b0e71266b1f349b5d16 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Fri, 3 Sep 2010 23:08:43 +0300
Subject: VWR-20696 ADDITIONAL FIX Fixed broken buttons in detached sidebar
 panels.

Buttons belonging items of some FlatListView instances didn't work (i.e. click on them didn't invoke the callback)
if the list was inside a detached sidebar tab.
I'm working around that by a simple XML fix (disabled focusing the broken buttons), but the issue needs further investigation.
Affected panels: avatar list, group list, teleport history.

Reviewed by Sergey Litovchuk
---
 indra/newview/skins/default/xui/en/panel_avatar_list_item.xml      | 2 ++
 indra/newview/skins/default/xui/en/panel_group_list_item.xml       | 2 ++
 indra/newview/skins/default/xui/en/panel_teleport_history_item.xml | 1 +
 3 files changed, 5 insertions(+)

(limited to 'indra/newview/skins')

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 876ff9961b..f58715be56 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
@@ -79,6 +79,7 @@
      left_pad="3"
      right="-53"
      name="info_btn"
+     tab_stop="false"
      top_delta="-2"
      width="16" />
     <button
@@ -89,6 +90,7 @@
      left_pad="5"
      right="-28"
      name="profile_btn"
+     tab_stop="false"
      tool_tip="View profile"
      top_delta="-2"
      width="20" />
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 ab34cbf20e..0b84ac03c5 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
@@ -55,6 +55,7 @@
      left_pad="3"
      right="-31"
      name="info_btn"
+     tab_stop="false"
      top_delta="-2"
      width="16" />
    <!--*TODO: Should only appear on rollover-->
@@ -66,6 +67,7 @@
      left_pad="5"
      right="-3"
      name="profile_btn"
+     tab_stop="false"
      tool_tip="View profile"
      top_delta="-2"
      width="20" />
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 d38ad8c5f8..c89e1dc215 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
@@ -56,6 +56,7 @@
      left_pad="5"
      right="-3"
      name="profile_btn"
+     tab_stop="false"
      tool_tip="Show item info"
      top="1"
      visible="false"
-- 
cgit v1.2.3


From b2eb877d528c5328098a0b607b98f787706857aa Mon Sep 17 00:00:00 2001
From: Kent Quirk <q@lindenlab.com>
Date: Fri, 3 Sep 2010 17:37:17 -0400
Subject: vwr-20945 - make menu bar blue when using a project viewer

---
 indra/newview/skins/default/colors.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 5ba1fc9b21..b489294f38 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -86,6 +86,9 @@
 	<color
 	name="LtOrange"
 	value="1 .85 .73 1" />
+	<color
+	name="MdBlue"
+	value=".07 .38 .51 1" />
 
   <!-- This color name makes potentially unused colors show up bright purple.
   Leave this here until all Unused? are removed below, otherwise
@@ -749,4 +752,7 @@
     <color
      name="ChatTimestampColor"
      reference="White" />
+    <color
+     name="MenuBarProjectBgColor"
+     reference="MdBlue" />
 </colors>
-- 
cgit v1.2.3


From 21d4429caa172120ffa7a225656706a0af2febb7 Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Sat, 4 Sep 2010 01:24:15 +0300
Subject: VWR-21585 FIXED My Inventory and My Appearance side panels layout to
 support horizontal resizing. Added minimal width for detached side panel
 floater.

---
 .../skins/default/xui/en/floater_side_bar_tab.xml  |   1 +
 .../skins/default/xui/en/panel_edit_wearable.xml   |  65 ++++++--
 .../skins/default/xui/en/panel_outfit_edit.xml     | 105 ++++++++-----
 .../default/xui/en/panel_outfits_inventory.xml     |  96 +++++++----
 .../skins/default/xui/en/sidepanel_appearance.xml  |   8 +-
 .../skins/default/xui/en/sidepanel_inventory.xml   | 175 +++++++++++++--------
 .../skins/default/xui/en/sidepanel_item_info.xml   |  12 +-
 7 files changed, 306 insertions(+), 156 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml b/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml
index 9ec3410afd..bf0913fde7 100644
--- a/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml
+++ b/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml
@@ -2,6 +2,7 @@
 <floater
  can_close="false"
  can_resize="true"
+ min_width="150"
  save_rect="true"
  save_visibility="true"
  >
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index 9fb777e0e7..95c1c822b8 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -187,7 +187,7 @@
          width="150" />
         <radio_group
          control_name="AvatarSex"
-         follows="left|top|right"
+         follows="top|right"
          height="20"
          layout="topleft"
          left="210"
@@ -217,6 +217,7 @@
         </radio_group>
         <!--  graphical labels for the radio buttons above -->
         <icon
+         follows="top|right"
          height="16"
          image_name="icons/Male.png"
          layout="topleft"
@@ -226,6 +227,7 @@
          top="7"
          width="16" />
         <icon
+         follows="top|right"
          height="16"
          image_name="icons/Female.png"
          layout="topleft"
@@ -416,22 +418,55 @@
      name="button_panel"
      top_pad="6"
      width="333">
-        <button
-         follows="bottomleft"
+        <layout_stack
+         follows="bottom|left|right"
          height="23"
-         label="Save As"
          layout="topleft"
-         left="8"
-         name="save_as_button"
+         mouse_opaque="false"
+         name="button_panel_ls"
+         left="0"
+         orientation="horizontal"
          top="0"
-         width="153" />
-        <button
-         follows="bottomleft"
-         height="23"
-         label="Undo Changes"
-         layout="topleft"
-         left_pad="7"
-         name="revert_button"
-         width="152" />
+         width="333">	
+            <layout_panel
+             follows="bottom|left|right"
+             height="23"
+             layout="bottomleft"
+             left="0"			
+             mouse_opaque="false"
+             name="save_as_btn_lp"
+             user_resize="false" 
+             auto_resize="true"
+             width="154">
+                <button
+                 follows="bottom|left|right"
+                 height="23"
+                 label="Save As"
+                 layout="topleft"
+                 left="1"
+                 name="save_as_button"
+                 top="0"
+                 width="153" />
+            </layout_panel>
+            <layout_panel
+             follows="bottom|left|right"
+             height="23"
+             layout="bottomleft"
+             left_pad="3"			
+             mouse_opaque="false"
+             name="revert_btn_lp"
+             user_resize="false" 
+             auto_resize="true"
+             width="152">
+                <button
+                 follows="bottom|left|right"
+                 height="23"
+                 label="Undo Changes"
+                 layout="topleft"
+                 left_pad="7"
+                 name="revert_button"
+                 width="152" />
+            </layout_panel>
+        </layout_stack>
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index e6714af943..1cbdecab9d 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -71,7 +71,7 @@
      top="1"
      width="30" />
     <text
-     follows="top|right"
+     follows="top|left|right"
      font="SansSerifHugeBold"
      height="26"
      layout="topleft"
@@ -108,7 +108,7 @@
          width="31" />
             <panel
              bevel_style="none"
-             follows="top|right"
+             follows="top|left|right"
              height="37"
              layout="topleft"
              left_pad="5"
@@ -494,39 +494,72 @@ It is calculated as border_size + 2*UIResizeBarOverlap
      top_pad="2"
      name="save_revert_button_bar"
      width="300">
-        <button
-         follows="bottom|left"
-         height="23"
-         label="Save"
-         left="0"
-         layout="topleft"
-         name="save_btn"
-         top="0"
-         width="155" />
-        <button
-         follows="bottom|left"
-         height="23"
-         name="save_flyout_btn"
-         label=""
-         layout="topleft"
-         left_pad="-20"
-         tab_stop="false"
-         top="0"
-         image_selected="SegmentedBtn_Right_Selected_Press"
-         image_unselected="SegmentedBtn_Right_Off"
-         image_pressed="SegmentedBtn_Right_Press"
-         image_pressed_selected="SegmentedBtn_Right_Selected_Press"
-         image_overlay="Arrow_Small_Up"
-         width="20"/>
-        <button
-         follows="bottom|left|right"
-         height="23"
-         left_pad="12"
-         label="Undo Changes"
-         layout="topleft"
-         name="revert_btn"
-         top="0"
-         tool_tip="Revert to last saved version"
-         width="147" />
+			<layout_stack
+     	         follows="bottom|left|right"
+		         height="23"
+		         layout="topleft"
+		         mouse_opaque="false"
+		         name="button_bar_ls"
+		         left="0"
+		         orientation="horizontal"
+		         top="0"
+		         width="313">	
+			    <layout_panel
+			         follows="bottom|left|right"
+			         height="23"
+                     layout="bottomleft"
+                     left="0"			
+                     mouse_opaque="false"
+                     name="save_btn_lp"
+                     user_resize="false" 
+                     auto_resize="true"
+                     width="156">
+                    <button
+                         follows="bottom|left|right"
+                         height="23"
+                         label="Save"
+                         left="1"
+                         layout="topleft"
+                         name="save_btn"
+                         top="0"
+                         width="155" />
+                    <button
+                         follows="bottom|right"
+                         height="23"
+                         name="save_flyout_btn"
+                         label=""
+                         layout="topleft"
+                         left_pad="-20"
+                         tab_stop="false"
+                         top="0"
+                         image_selected="SegmentedBtn_Right_Selected_Press"
+                         image_unselected="SegmentedBtn_Right_Off"
+                         image_pressed="SegmentedBtn_Right_Press"
+                         image_pressed_selected="SegmentedBtn_Right_Selected_Press"
+                         image_overlay="Arrow_Small_Up"
+                         width="20"/>
+			    </layout_panel>
+			    <layout_panel
+                     follows="bottom|left|right"
+                     height="23"
+                     layout="bottomleft"
+                     left_pad="3"			
+                     mouse_opaque="false"
+                     name="revert_btn_lp"
+                     user_resize="false" 
+                     auto_resize="true"
+                     width="147">
+                    <button
+                         follows="bottom|left|right"
+                         height="23"
+                         left="0"
+                         label="Undo Changes"
+                         layout="topleft"
+                         name="revert_btn"
+                         top="0"
+                         tool_tip="Revert to last saved version"
+                         width="147" />
+			    </layout_panel>
+			</layout_stack>
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index 82b69ba8dc..88c82313dd 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -67,36 +67,70 @@
        visible="true"
        name="bottom_panel"
        width="310">
-      <button
-           follows="bottom|left"
-           height="23"
-           label="Save As"
-           left="0"
-           layout="topleft"
-           name="save_btn"
-           top_pad="0"
-           width="155" />
-      <button
-           follows="bottom|left"
-          height="23"
-           name="save_flyout_btn"
-           label=""
-           layout="topleft"
-           left_pad="-20"
-           tab_stop="false"
-           image_selected="SegmentedBtn_Right_Selected_Press"
-           image_unselected="SegmentedBtn_Right_Off"
-           image_pressed="SegmentedBtn_Right_Press"
-           image_pressed_selected="SegmentedBtn_Right_Selected_Press"
-           image_overlay="Arrow_Small_Up"
-           width="20"/>
-      <button
-          follows="bottom|left|right" 
-          height="23" 
-          label="Wear"
-          layout="topleft"
-          name="wear_btn"
-          left_pad="3"
-          width="152" />
+			<layout_stack
+     	         follows="bottom|left|right"
+		         height="23"
+		         layout="topleft"
+		         mouse_opaque="false"
+		         name="bottom_panel_ls"
+		         left="0"
+		         orientation="horizontal"
+		         top="0"
+		         width="313">	
+			    <layout_panel
+			         follows="bottom|left|right"
+			         height="23"
+                     layout="bottomleft"
+                     left="0"			
+                     mouse_opaque="false"
+                     name="save_btn_lp"
+                     user_resize="false" 
+                     auto_resize="true"
+                     width="156">
+                    <button
+                         follows="bottom|left|right"
+                         height="23"
+                         label="Save As"
+                         left="1"
+                         layout="topleft"
+                         name="save_btn"
+                         top="0"
+                         width="155" />
+                    <button
+                         follows="bottom|right"
+                         height="23"
+                         name="save_flyout_btn"
+                         label=""
+                         layout="topleft"
+                         left_pad="-20"
+                         tab_stop="false"
+                         image_selected="SegmentedBtn_Right_Selected_Press"
+                         image_unselected="SegmentedBtn_Right_Off"
+                         image_pressed="SegmentedBtn_Right_Press"
+                         image_pressed_selected="SegmentedBtn_Right_Selected_Press"
+                         image_overlay="Arrow_Small_Up"
+                         width="20"/>
+			    </layout_panel>
+			    <layout_panel
+                     follows="bottom|left|right"
+                     height="23"
+                     layout="bottomleft"
+                     left_pad="3"			
+                     mouse_opaque="false"
+                     name="wear_btn_lp"
+                     user_resize="false" 
+                     auto_resize="true"
+                     width="152">
+                    <button
+                         follows="bottom|left|right"
+                         height="23"
+                         label="Wear"
+                         layout="topleft"
+                         name="wear_btn"
+                         left="0"
+                         top="0"
+                         width="152" />
+			    </layout_panel>
+			</layout_stack>
    </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 02ab0ffee5..c1c0f07304 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -65,7 +65,7 @@ width="333">
       text_color="EmphasisColor"
       width="300"
       height="10"
-      follows="top|left"
+      follows="top|left|right"
       layout="topleft"
       left="35"
       top="3"
@@ -81,14 +81,14 @@ width="333">
       top="15"
       use_ellipses="true"
       width="230"
-      follows="top|left"
+      follows="top|left|right"
       word_wrap="false"
       mouse_opaque="false"
       name="currentlook_name">
       MyOutfit With a really Long Name like MOOSE
       </text>
       <button
-      follows="left|top"
+      follows="top|right"
       height="28"
       image_overlay="Edit_Wrench"
       label=""
@@ -99,7 +99,7 @@ width="333">
       top="3"
       width="28" />
       <loading_indicator
-      follows="left|top"
+      follows="top|right"
       height="24"
       layout="topleft"
       left="268"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 6c9acae35e..f3c6895cee 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -31,77 +31,122 @@
 			 height="545"
 			 width="330" />
 		<panel
+		     follows="bottom|left|right"
 			 height="25"
 			 layout="topleft"
 			 name="button_panel"
 			 left="9"
 			 top_pad="-2"
 			 width="313">
-			<button
-				 enabled="true"
-				 follows="bottom|left"
-				 height="23"
-				 label="Profile"
-				 layout="topleft"
-				 left="0"
-				 name="info_btn"
-				 tool_tip="Show object profile"
-				 top="0"
-				 width="102" />
-			<button
-				 enabled="true"
-				 follows="bottom|left"
-				 height="23"
-				 label="Share"
-				 layout="topleft"
-				 left="105"
-				 name="share_btn"
-				 tool_tip="Share an inventory item"
-				 top="0"
-				 width="102" />
-			<button
-				 enabled="true"
-				 follows="bottom|left"
-				 height="23"
-				 label="Shop"
-				 layout="topleft"
-				 left="210"
-				 name="shop_btn"
-				 tool_tip="Open Marketplace webpage"
-				 top="0"
-				 width="102" />
-			<button
-				 enabled="false"
-				 follows="bottom|left"
-				 height="23"
-				 label="Wear"
-				 layout="topleft"
-				 left="210"
-				 name="wear_btn"
-				 tool_tip="Wear seleceted outfit"
-				 top="0"
-				 width="102" />
-			<button
-				 enabled="false"
-				 follows="bottom|left"
-				 height="23"
-				 label="Play"
-				 layout="topleft"
-				 name="play_btn"
-				 left="210"
-				 top="0"
-				 width="102" />
-			<button
-				 enabled="false"
-				 follows="bottom|left"
-				 height="23"
-				 label="Teleport"
-				 layout="topleft"
-				 left="210"
-				 name="teleport_btn"
-				 tool_tip="Teleport to the selected area"
-				 top="0"
-				 width="102" />
+			<layout_stack
+     	         follows="bottom|left|right"
+		         height="23"
+		         layout="topleft"
+		         mouse_opaque="false"
+		         name="button_panel_ls"
+		         left="0"
+		         orientation="horizontal"
+		         top="0"
+		         width="313">	
+			    <layout_panel
+			         follows="bottom|left|right"
+			         height="23"
+                     layout="bottomleft"
+                     left="0"			
+                     mouse_opaque="false"
+                     name="info_btn_lp"
+                     user_resize="false" 
+                     auto_resize="true"
+                     width="103">
+                    <button
+                         enabled="true"
+                         follows="bottom|left|right"
+                         height="23"
+                         label="Profile"
+                         layout="topleft"
+                         left="1"
+                         name="info_btn"
+                         tool_tip="Show object profile"
+                         top="0"
+                         width="102" />
+			    </layout_panel>
+			    <layout_panel
+                     follows="bottom|left|right"
+                     height="23"
+                     layout="bottomleft"
+                     left_pad="3"			
+                     mouse_opaque="false"
+                     name="share_btn_lp"
+                     user_resize="false" 
+                     auto_resize="true"
+                     width="102">
+                    <button
+                         enabled="true"
+                         follows="bottom|left|right"
+                         height="23"
+                         label="Share"
+                         layout="topleft"
+                         left="0"
+                         name="share_btn"
+                         tool_tip="Share an inventory item"
+                         top="0"
+                         width="102" />
+			    </layout_panel>
+			    <layout_panel
+                     follows="bottom|left|right"
+                     height="23"
+                     layout="bottomleft"
+                     left_pad="3"			
+                     mouse_opaque="false"
+                     name="shop_btn_lp"
+                     user_resize="false" 
+                     auto_resize="true"
+                     width="102">
+                    <button
+                         enabled="true"
+                         follows="bottom|left|right"
+                         height="23"
+                         label="Shop"
+                         layout="topleft"
+                         left="0"
+                         name="shop_btn"
+                         tool_tip="Open Marketplace webpage"
+                         top="0"
+                         width="102" />
+                    <button
+                         enabled="false"
+                         follows="bottom|left|right"
+                         height="23"
+                         label="Wear"
+                         layout="topleft"
+                         left="0"
+                         name="wear_btn"
+                         tool_tip="Wear seleceted outfit"
+                         top="0"
+                         width="102" />
+                    <button
+                         enabled="false"
+                         follows="bottom|left|right"
+                         height="23"
+                         label="Play"
+                         layout="topleft"
+                         name="play_btn"
+                         left="0"
+                         top="0"
+                         width="102" />
+                    <button
+                         enabled="false"
+                         follows="bottom|left|right"
+                         height="23"
+                         label="Teleport"
+                         layout="topleft"
+                         left="0"
+                         name="teleport_btn"
+                         tool_tip="Teleport to the selected area"
+                         top="0"
+                         width="102" />
+			    </layout_panel>
+			</layout_stack>
 		</panel>
 	</panel>
 
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 49b252174c..4f923f411c 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
+     follows="all"
 	 height="570"
 	 layout="topleft"
 	 name="item properties"
@@ -45,7 +46,7 @@
 	     top="8"
 	     width="18" />
     <button
-     follows="top|right"
+     follows="top|left"
      height="24"
      image_hover_unselected="BackButton_Over"
      image_pressed="BackButton_Press"
@@ -69,14 +70,15 @@
      value="Item Profile"
      width="275" />
     	    <text
-     follows="top|left"
+     follows="top|left|right"
      height="13"
      layout="topleft"
      left="45"
      name="origin"
      text_color="LtGray_50"
+     use_ellipses="true"
      value="(Inventory)"
-     width="150" />
+     width="275" />
 	<panel
          follows="all"
          height="493"
@@ -234,7 +236,7 @@ top_pad="10"
 	     <text
 			 type="string"
 			 length="1"
-			 follows="left|top"
+			 follows="left|top|right"
 			 height="23"
 			 layout="topleft"
 			 left_delta="78"
@@ -244,7 +246,7 @@ top_pad="10"
       </text>
 	 <panel
          border="false"
-         follows="left|top"
+         follows="left|top|right"
          layout="topleft"
          mouse_opaque="false"
          name="perms_inv"
-- 
cgit v1.2.3


From cb14dc9adaedd2734b09471ae1dec56f96509402 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Mon, 6 Sep 2010 13:42:19 +0100
Subject: SRCH-465 Classifieds titles and descriptions are too long.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
index a5c74b08e7..15efdf424e 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -119,7 +119,7 @@
          layout="topleft"
          left="10"
          top_pad="2"
-         max_length="63"
+         max_length="30"
          name="classified_name"
          prevalidate_callback="ascii"
          text_color="black"
@@ -147,7 +147,7 @@
          layout="topleft"
          left="10"
          top_pad="2"
-         max_length="1023"
+         max_length="64"
          name="classified_desc"
          text_color="black"
          word_wrap="true" />
-- 
cgit v1.2.3


From 94af8b77df5fd63cb30ee676a313897b90841672 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Mon, 6 Sep 2010 17:33:48 +0300
Subject: VWR-20696 ADDITIONAL FIX Added and made use of new dock/undock icons.

---
 .../textures/taskpanel/Sidebar_Icon_Dock_Foreground.png  | Bin 0 -> 2899 bytes
 .../textures/taskpanel/Sidebar_Icon_Dock_Press.png       | Bin 0 -> 2886 bytes
 .../taskpanel/Sidebar_Icon_Undock_Foreground.png         | Bin 0 -> 2896 bytes
 .../textures/taskpanel/Sidebar_Icon_Undock_Press.png     | Bin 0 -> 2920 bytes
 indra/newview/skins/default/textures/textures.xml        |   6 ++++++
 .../skins/default/xui/en/panel_side_tray_tab_caption.xml |  12 ++++++------
 6 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Foreground.png
 create mode 100644 indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Press.png
 create mode 100644 indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Foreground.png
 create mode 100644 indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Press.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Foreground.png b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Foreground.png
new file mode 100644
index 0000000000..50c01062a5
Binary files /dev/null and b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Foreground.png differ
diff --git a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Press.png b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Press.png
new file mode 100644
index 0000000000..bf2065cd37
Binary files /dev/null and b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Press.png differ
diff --git a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Foreground.png b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Foreground.png
new file mode 100644
index 0000000000..8b48258142
Binary files /dev/null and b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Foreground.png differ
diff --git a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Press.png b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Press.png
new file mode 100644
index 0000000000..09efe779fe
Binary files /dev/null and b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Press.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 082b37d80b..ce67cf0083 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -428,6 +428,12 @@ with the same filename but different name
   <texture name="SegmentedBtn_Right_Selected_Disabled" file_name="widgets/SegmentedBtn_Right_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
 
   <texture name="Shirt_Large" file_name="icons/Shirt_Large.png" preload="false" />
+
+  <texture name="Sidebar_Icon_Dock_Foreground" file_name="taskpanel/Sidebar_Icon_Dock_Foreground.png" preload="false" />
+  <texture name="Sidebar_Icon_Dock_Press" file_name="taskpanel/Sidebar_Icon_Dock_Press.png" preload="false" />
+  <texture name="Sidebar_Icon_Undock_Foreground" file_name="taskpanel/Sidebar_Icon_Undock_Foreground.png" preload="false" />
+  <texture name="Sidebar_Icon_Undock_Press" file_name="taskpanel/Sidebar_Icon_Undock_Press.png" preload="false" />
+
   <texture name="Shop" file_name="icons/Shop.png" preload="false" />
 
   <texture name="SkipBackward_Off" file_name="icons/SkipBackward_Off.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
index 58112306d8..557b04d281 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
@@ -22,9 +22,9 @@
      <button
      follows="right|top"
      height="16"
-     image_selected="tearoffbox.tga"
-     image_unselected="tearoffbox.tga"
-     image_disabled="tearoff_pressed.tga"
+     image_selected="Sidebar_Icon_Undock_Press"
+     image_unselected="Sidebar_Icon_Undock_Foreground"
+     image_disabled="Sidebar_Icon_Undock_Press"
      layout="topleft"
      name="undock"
      top="10"
@@ -34,9 +34,9 @@
      <button
      follows="right|top"
      height="16"
-     image_selected="Icon_Dock_Press"
-     image_unselected="Icon_Dock_Foreground"
-     image_disabled="Icon_Dock_Press"
+     image_selected="Sidebar_Icon_Dock_Press"
+     image_unselected="Sidebar_Icon_Dock_Foreground"
+     image_disabled="Sidebar_Icon_Dock_Press"
      layout="topleft"
      name="dock"
      top="10"
-- 
cgit v1.2.3


From e04dabd2b3309b595bbc1afa0dfa7d4081439eba Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Mon, 6 Sep 2010 21:35:01 +0300
Subject: VWR-20705 VWR-20706 FIXED Implemented drag'n'drop of buttons in
 bottomtray.

- Though visually user drags buttons, layout panels are really moved. To move one panel before other, new method movePanelBeforeOther() was added to layout stack.

- When drag'n'drop is finished, order of panels in layout stack mToolbarStack is changed, and also order vectors are updated in bottomtray.These are vectors mButtonsProcessOrder and mButtonsOrder. mButtonsOrder was introduced in this changeset to store order of all bottomtray buttons that may change place via drag'n'drop and should save and load it between sessions. mButtonsProcessOrder is not enough for it because it contains only buttons that may be hidden(and for example Speak button is not included in it).

- To pass mouse events from buttons to bottomtray, new class LLBottomtrayButton was added (and new widget bottomtray_button for it).

Reviewed by Vadim Savchuk.
---
 .../skins/default/xui/en/panel_bottomtray.xml      | 32 ++++++++++++----------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 4b622691b3..cdd596222d 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -11,6 +11,9 @@
  name="bottom_tray"
  top="28"
  width="1310">
+    <string
+     name="DragIndicationImageName"
+     value="Accordion_ArrowOpened_Off" />
     <string
      name="SpeakBtnToolTip"
      value="Turns microphone on/off" />
@@ -135,7 +138,7 @@
          name="movement_panel"
          user_resize="false"
          width="83">
-            <button
+            <bottomtray_button
              follows="left|right"
              height="23"
              image_pressed="PushButton_Press"
@@ -152,7 +155,8 @@
                 <init_callback
                  function="Button.SetDockableFloaterToggle"
                  parameter="moveview" />
-            </button>
+            </bottomtray_button>
+
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -165,7 +169,7 @@
          name="cam_panel"
          user_resize="false"
          width="83">
-            <button
+            <bottomtray_button
              follows="left|right"
              height="23"
              image_pressed="PushButton_Press"
@@ -183,7 +187,7 @@
                 <init_callback
                  function="Button.SetDockableFloaterToggle"
                  parameter="camera" />
-            </button>
+            </bottomtray_button>
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -195,7 +199,7 @@
          name="snapshot_panel"
          user_resize="false"
          width="39">
-            <button
+            <bottomtray_button
              follows="left|right"
              height="23"
              image_overlay="Snapshot_Off"
@@ -212,7 +216,7 @@
                 <init_callback
                  function="Button.SetFloaterToggle"
                  parameter="snapshot" />
-            </button>
+            </bottomtray_button>
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -228,7 +232,7 @@
 <!--*FIX: Build Floater is not opened with default registration. Will be fixed soon.
 Disabled for now.
 -->
-            <button
+            <bottomtray_button
              follows="left|right"
              height="23"
              image_pressed="PushButton_Press"
@@ -246,7 +250,7 @@ Disabled for now.
                 <commit_callback
                  function="Build.Toggle"
                  parameter="build" />
-            </button>
+            </bottomtray_button>
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -259,7 +263,7 @@ Disabled for now.
          name="search_btn_panel"
          user_resize="false"
          width="83">
-            <button
+            <bottomtray_button
              follows="left|right"
              height="23"
              image_pressed="PushButton_Press"
@@ -277,7 +281,7 @@ Disabled for now.
                 <init_callback
                  function="Button.SetFloaterToggle"
                  parameter="search" />
-            </button>
+            </bottomtray_button>
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -290,7 +294,7 @@ Disabled for now.
          name="world_map_btn_panel"
          user_resize="false"
          width="83">
-            <button
+            <bottomtray_button
              follows="left|right"
              height="23"
              image_pressed="PushButton_Press"
@@ -308,7 +312,7 @@ Disabled for now.
                 <init_callback
                  function="Button.SetFloaterToggle"
                  parameter="world_map" />
-            </button>
+            </bottomtray_button>
         </layout_panel>
         <layout_panel
          auto_resize="false"
@@ -321,7 +325,7 @@ Disabled for now.
          name="mini_map_btn_panel"
          user_resize="false"
          width="83">
-            <button
+            <bottomtray_button
              follows="left|right"
              height="23"
              image_pressed="PushButton_Press"
@@ -339,7 +343,7 @@ Disabled for now.
                 <init_callback
                  function="Button.SetFloaterToggle"
                  parameter="mini_map" />
-            </button>
+            </bottomtray_button>
         </layout_panel>
         <layout_panel
          follows="left|right"
-- 
cgit v1.2.3