summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/main_view.xml
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2009-12-08 22:15:17 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2009-12-08 22:15:17 -0500
commitcb88b7f4a41f66249129eaa9b173ec8c206a3958 (patch)
tree96258622b06d8c79eddfc2339d2b0323377521b1 /indra/newview/skins/default/xui/en/main_view.xml
parent7ce49586881fd078ea8bceeab558b4a156b30f63 (diff)
parentc130f5d4c9ea6ffb423f05d965168d10c6c99c05 (diff)
merge
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/skins/default/xui/en/main_view.xml')
-rw-r--r--indra/newview/skins/default/xui/en/main_view.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index a11ebf5af8..65a545d2ed 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -19,6 +19,7 @@
mouse_opaque="false"
name="nav_bar_container"
width="1024"
+ user_resize="false"
visible="false">
</layout_panel>
<layout_panel auto_resize="true"
@@ -43,7 +44,7 @@
layout="topleft"
mouse_opaque="false"
name="non_side_tray_view"
- user_resize="true"
+ user_resize="false"
width="500">
<view bottom="500"
follows="all"