diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-02 19:38:54 +0200 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-02 19:38:54 +0200 |
commit | a2e23aa3d9f6e8c156e97244a7694256f41f93c3 (patch) | |
tree | 1d7f37f638b7a17312164384b5b51216a34d6346 /indra/newview/skins/default/xui/en/main_view.xml | |
parent | eae60da6839906059d904c12cc155f4c2738c893 (diff) | |
parent | aa84c4afff251d771c7571803ccce56d1f439ae2 (diff) |
merge
--HG--
branch : product-engine
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" |