summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-10-07 12:09:16 -0700
committerRichard Linden <none@none>2011-10-07 12:09:16 -0700
commitca2f043ffeb0b6f7c0a5ea171411c45f6dcc0bf4 (patch)
tree0c0f6f1f47114efd836a4fa119d5c5bdd6d8b704 /indra/newview
parentfbe563fdf44c1843de29e189f05203fa4ab20d61 (diff)
moved stand/stop flying buttons to above bottom toolbar
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/main_view.xml9
-rw-r--r--indra/newview/skins/default/xui/en/panel_toolbar_view.xml14
2 files changed, 13 insertions, 10 deletions
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"