summaryrefslogtreecommitdiff
path: root/indra/newview/skins/minimal/xui/en
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/minimal/xui/en')
-rw-r--r--indra/newview/skins/minimal/xui/en/main_view.xml39
-rw-r--r--indra/newview/skins/minimal/xui/en/panel_bottomtray.xml5
2 files changed, 19 insertions, 25 deletions
diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 1fadd2d550..85e1045357 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -40,16 +40,7 @@
tab_stop="false"
name="hud"
width="1024">
- <layout_stack border_size="0"
- follows="all"
- height="500"
- left="0"
- mouse_opaque="false"
- name="hud_stack"
- orientation="horizontal"
- top="0"
- width="1024">
- <layout_panel auto_resize="true"
+ <panel auto_resize="false"
follows="all"
height="500"
layout="topleft"
@@ -57,7 +48,7 @@
tab_stop="false"
name="non_side_tray_view"
user_resize="false"
- width="500">
+ width="1024">
<layout_stack border_size="0"
bottom="500"
@@ -160,18 +151,7 @@
</panel>
</layout_panel>
</layout_stack>
- </layout_panel>
- <layout_panel auto_resize="false"
- follows="top|bottom"
- height="500"
- min_width="333"
- mouse_opaque="false"
- tab_stop="false"
- name="side_tray_container"
- user_resize="false"
- visible="false"
- width="333"/>
- </layout_stack>
+ </panel>
<debug_view follows="all"
left="0"
top="0"
@@ -181,6 +161,19 @@
width="1024"/>
</layout_panel>
</layout_stack>
+ <panel follows="top|bottom"
+ height="500"
+ mouse_opaque="false"
+ tab_stop="false"
+ name="hidden_side_tray"
+ visible="false"
+ width="333">
+ <panel
+ name="side_tray_container"
+ width="333"
+ height="500"/>
+ </panel>
+
<panel top="0"
follows="all"
mouse_opaque="false"
diff --git a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
index e9478c6465..4f696ccfe2 100644
--- a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
@@ -240,11 +240,12 @@
name="show_people_button"
tool_tip="Shows people window"
top="5"
+ is_toggle="true"
use_ellipses="true"
width="100">
<bottomtray_button.commit_callback
- function=""
- parameter="" />
+ function="ShowSidetrayPanel"
+ parameter="panel_people" />
</bottomtray_button>
</layout_panel>
<layout_panel