From fbe563fdf44c1843de29e189f05203fa4ab20d61 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 7 Oct 2011 12:03:29 -0700
Subject: adjusted toolbar padding per spec

---
 indra/newview/skins/default/xui/en/panel_toolbar_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
index 44da813f61..31a26dab7f 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -41,10 +41,10 @@
         <toolbar follows="left|top|bottom"
                  button_panel.bg_opaque_image="Rounded_Rect_Right"
                  name="toolbar_left"
-                 height="500"
                  width="30"
                  left="0"
-                 top="0"
+                 top="10"
+                 bottom="-10"
                  side="left"
                  button_display_mode="icons_only">
         </toolbar>
@@ -63,10 +63,10 @@
           button_panel.bg_opaque_image="Rounded_Rect_Left"
           follows="right|top|bottom"
           name="toolbar_right"
-          height="500"
           width="30"
           left="0"
-          top="0"
+          top="10"
+          bottom="-10"
           side="right"
           button_display_mode="icons_only">
         </toolbar>
@@ -83,8 +83,8 @@
              button_panel.bg_opaque_image="Rounded_Rect_Top"
              name="toolbar_bottom"
              height="30"
-             width="1024"
-             left="0"
+             left="40"
+             right="-40"
              top="0"
              side="bottom"
              follows="left|right|bottom"
-- 
cgit v1.2.3


From ca2f043ffeb0b6f7c0a5ea171411c45f6dcc0bf4 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 7 Oct 2011 12:09:16 -0700
Subject: moved stand/stop flying buttons to above bottom toolbar

---
 indra/newview/skins/default/xui/en/main_view.xml          |  9 ---------
 indra/newview/skins/default/xui/en/panel_toolbar_view.xml | 14 +++++++++++++-
 2 files changed, 13 insertions(+), 10 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index cf566d7d23..57baa7cdd3 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -90,15 +90,6 @@
                      top="0"
                      visible="false"
                      width="1024"/>
-              <panel bottom="500"
-                     follows="left|right|bottom"
-                     height="25"
-                     left="0"
-                     mouse_opaque="false"
-                     tab_stop="false"
-                     name="stand_stop_flying_container"
-                     visible="false"
-                     width="500"/>
             </layout_panel>
             <!--<layout_panel auto_resize="false"
                    min_height="33"
diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
index 31a26dab7f..03d45887d4 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -52,7 +52,19 @@
       <layout_panel name="non_toolbar_panel"
                     auto_resize="true"
                     user_resize="false"
-                    mouse_opaque="false"/>
+                    mouse_opaque="false"
+                    height="100"
+                    width="100">
+        <panel bottom="100"
+               follows="left|right|bottom"
+               height="25"
+               left="0"
+               mouse_opaque="false"
+               tab_stop="false"
+               name="stand_stop_flying_container"
+               visible="false"
+               width="100"/>
+      </layout_panel>
       <layout_panel name="right_toolbar_panel"
                     auto_resize="false"
                     user_resize="false"
-- 
cgit v1.2.3