diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-07 18:44:16 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-07 18:44:16 -0700 |
| commit | 60c85dff83918876b23ab1ff1dfd336fc9dbc839 (patch) | |
| tree | 74a99cfc8bcf36e6354c7f74c1f7a2c7ae054140 /indra/newview/skins/default/xui/en | |
| parent | feabe29f356ca2bae5275a5cb0d772614166d2c5 (diff) | |
| parent | 3a280f747dae737fd03bd4c2c886aa6231c0b703 (diff) | |
Pull from richard/viewer-experience-fui/
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/main_view.xml | 9 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_toolbar_view.xml | 20 |
2 files changed, 16 insertions, 13 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 7289001481..03d45887d4 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="483" width="30" left="0" top="10" + bottom="-10" side="left" button_display_mode="icons_only"> </toolbar> @@ -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" @@ -63,10 +75,10 @@ button_panel.bg_opaque_image="Rounded_Rect_Left" follows="right|top|bottom" name="toolbar_right" - height="483" width="30" left="0" top="10" + bottom="-10" side="right" button_display_mode="icons_only"> </toolbar> @@ -83,8 +95,8 @@ button_panel.bg_opaque_image="Rounded_Rect_Top" name="toolbar_bottom" height="30" - width="944" left="40" + right="-40" top="0" side="bottom" follows="left|right|bottom" |