diff options
author | James Cook <james@lindenlab.com> | 2009-12-01 11:47:13 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-12-01 11:47:13 -0800 |
commit | dd6fa93d84a267c6367f83c2d7581207e6dd878d (patch) | |
tree | 1a40f8b6dc205addad73637f4d02caa060c88838 /indra/newview/skins/default/xui/en/main_view.xml | |
parent | 27351b8bf59c3b2cfc31c27947397055a40b52d7 (diff) | |
parent | 8025c15a71fa1ee9fa34781f7cf74dde8c4e622b (diff) |
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/main_view.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/main_view.xml | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index 3bf7f50a2c..d99205b2fe 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -48,7 +48,7 @@ height="500" layout="topleft" mouse_opaque="false" - name="main_view" + name="non_side_tray_view" user_resize="true" width="500"> <view bottom="500" @@ -108,15 +108,25 @@ visible="false" width="333"/> </layout_stack> - <floater_view follows="all" + <panel follows="all" height="500" left="0" mouse_opaque="false" - name="Floater View" + name="floater_view_holder" tab_group="-1" tab_stop="false" top="0" - width="1024"/> + width="1024"> + <floater_view follows="all" + height="500" + left="0" + mouse_opaque="false" + name="Floater View" + tab_group="-1" + tab_stop="false" + top="0" + width="1024"/> + </panel> <debug_view follows="all" left="0" top="0" |