diff options
author | Monroe Linden <monroe@lindenlab.com> | 2010-12-20 11:21:17 -0800 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2010-12-20 11:21:17 -0800 |
commit | dee57bea2526c84fb753abfd08e22c19f1cad21c (patch) | |
tree | 7fbe9a8cbb5957b78a37eb13f58f8b6786ec8cac /indra/newview/skins/default/xui/en/main_view.xml | |
parent | 67ca1c0b62cec74495104c0d78fc3743775bfd4e (diff) | |
parent | 25eef545fd7f6513ae4c590126aef1dc06494f56 (diff) |
Merge from viewer-development.
Diffstat (limited to 'indra/newview/skins/default/xui/en/main_view.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/main_view.xml | 8 |
1 files changed, 7 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 520a604bde..d9991fcae9 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -8,6 +8,12 @@ tab_stop="false" name="main_view" width="1024"> + <panel top="0" + follows="all" + height="768" + mouse_opaque="false" + name="login_panel_holder" + width="1024"/> <layout_stack border_size="0" follows="all" mouse_opaque="false" @@ -120,7 +126,7 @@ user_resize="false" visible="false" width="333"/> - </layout_stack> + </layout_stack> <panel follows="all" height="500" left="0" |