diff options
| author | James Cook <james@lindenlab.com> | 2010-03-10 20:32:56 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-03-10 20:32:56 -0800 |
| commit | f0d3ea53cd570eeca88df1d0c7d8a73c0877789b (patch) | |
| tree | 7cfb648d666fcfeaf7fc5ef2b13bb21870bedc0a /indra/newview/skins/default | |
| parent | dbc22bea7bba0c903a5090b24814f97b61a604b6 (diff) | |
| parent | dcbf0ab31ba256791e58dfc2aa3bf61609a8a797 (diff) | |
Merge latest from viewer-hotfix, including fix for TOS screen
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/main_view.xml | 18 |
1 files changed, 17 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 85853f39bb..1ace760816 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -143,12 +143,19 @@ <panel mouse_opaque="false" follows="left|right|top" name="status_bar_container" - tab_stop="false" + tab_stop="false" height="19" left="0" top="0" width="1024" visible="false"/> + <view mouse_opaque="false" + follows="all" + name="menu_bar_holder" + left="0" + top="0" + width="1024" + height="768"/> <notify_box_view top="0" follows="all" height="768" @@ -159,6 +166,15 @@ <panel top="0" follows="all" height="768" + mouse_opaque="true" + name="progress_view" + filename="panel_progress.xml" + class="progress_view" + width="1024" + visible="false"/> + <panel top="0" + follows="all" + height="768" mouse_opaque="false" name="popup_holder" class="popup_holder" |