summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/main_view.xml
diff options
context:
space:
mode:
authorcallum <none@none>2009-12-09 14:56:48 -0800
committercallum <none@none>2009-12-09 14:56:48 -0800
commita97479f41bae05ff08b3598a9497be9be3ee371d (patch)
tree860b0e365bc24fb056030622bdb04574e6f46ba3 /indra/newview/skins/default/xui/en/main_view.xml
parentdc3cad90c1cd4490d8035832138579f9711f8549 (diff)
parent874f53230dbe40e599e8903fae87a60816508fd6 (diff)
Merge with head
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"