summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-03-10 18:22:26 -0800
committerRichard Nelson <none@none>2010-03-10 18:22:26 -0800
commitdcbf0ab31ba256791e58dfc2aa3bf61609a8a797 (patch)
tree3d3559b54bc597eba53d5b0b6c5d6cbee274d7af /indra/newview/skins
parent347585cf975afac59ec6b9960e093acd015627f5 (diff)
parent1e5fe95b1d2d4912a3c9d84e2c32ff141f0dc4d9 (diff)
merge
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/main_view.xml18
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"