diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-12 20:01:16 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-12 20:01:16 +0200 |
| commit | a321c51edac7ee75a5b65a1954424e789d1f3b1c (patch) | |
| tree | d0742fb10f6ea53a11cf3228bad0092390e31059 /indra/newview/skins | |
| parent | 3e75fe4db1aa3659dfc34598ece090d845ac6c5a (diff) | |
| parent | f5c431aa7bce953503b33c957ba024bdd9104e63 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins')
| -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" |