diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-05-02 16:38:51 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-05-02 16:38:51 -0700 |
| commit | 9a6f06687e5b467f0c049bfbf88c2131eee11ef3 (patch) | |
| tree | 675d22abbed79141a4c0be922c17e44bbbf31e1b | |
| parent | f085d242dc9c47cfa55cdd3a79413fe6ed84ede5 (diff) | |
| parent | 9edcde56e907d1170fee311304e93449ad617d6a (diff) | |
merge
| -rw-r--r-- | indra/newview/skins/default/xui/en/main_view.xml | 16 | ||||
| -rw-r--r-- | indra/newview/skins/minimal/xui/en/main_view.xml | 15 |
2 files changed, 17 insertions, 14 deletions
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index e5ae0b950a..3ead67ca57 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -8,12 +8,6 @@ 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" @@ -133,7 +127,14 @@ user_resize="false" visible="false" width="333"/> - </layout_stack> + </layout_stack> + <panel top="0" + follows="all" + height="500" + mouse_opaque="false" + name="login_panel_holder" + width="1024"/> + <panel follows="all" height="500" left="0" @@ -171,6 +172,7 @@ top="0" width="1024" visible="false"/> + <view mouse_opaque="false" follows="all" name="menu_bar_holder" diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml index 45ba785c1f..ac5bae2f3b 100644 --- a/indra/newview/skins/minimal/xui/en/main_view.xml +++ b/indra/newview/skins/minimal/xui/en/main_view.xml @@ -8,13 +8,6 @@ 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" @@ -96,6 +89,14 @@ name="stand_stop_flying_container" visible="false" width="500"/> + + <panel top="0" + follows="all" + height="500" + mouse_opaque="false" + name="login_panel_holder" + width="1024"/> + <panel follows="all" height="500" left="0" |