summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-12-04 16:05:29 -0800
committerJames Cook <james@lindenlab.com>2009-12-04 16:05:29 -0800
commit738dabede22236e2f9618c402362ada88c785d68 (patch)
treebbad95689318edcb890f717b7eb77a31793b59f7 /indra/newview/skins
parent7efab06d57624f6d7568abacef667468f11ed2ba (diff)
parent7a83e8913d2eb6485eaf63e89a1ccc138a5a738f (diff)
merge
Diffstat (limited to 'indra/newview/skins')
-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"