summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorEli Linden <eli@lindenlab.com>2010-03-23 17:05:37 -0700
committerEli Linden <eli@lindenlab.com>2010-03-23 17:05:37 -0700
commit21116553713a6808423d17e09ba13f402eeaf954 (patch)
tree27d000428dd44702f8289b018f591cae6bb93efe /indra/newview/skins
parent770fb57a6c88e99411b2fddf3f590bc38452ec90 (diff)
parent85c1b3f74aeaa342124fd24e888c93abd34c9df9 (diff)
Merge
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/main_view.xml28
1 files changed, 18 insertions, 10 deletions
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 1ace760816..e8f9d65be5 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -173,6 +173,24 @@
width="1024"
visible="false"/>
<panel top="0"
+ follows="all"
+ mouse_opaque="false"
+ left="0"
+ name="snapshot_floater_view_holder"
+ width="1024"
+ height="798">
+ <snapshot_floater_view enabled="false"
+ follows="all"
+ height="768"
+ left="0"
+ mouse_opaque="false"
+ name="Snapshot Floater View"
+ tab_stop="false"
+ top="0"
+ visible="false"
+ width="1024"/>
+ </panel>
+ <panel top="0"
follows="all"
height="768"
mouse_opaque="false"
@@ -185,16 +203,6 @@
mouse_opaque="false"
name="Menu Holder"
width="1024"/>
- <snapshot_floater_view enabled="false"
- follows="all"
- height="768"
- left="0"
- mouse_opaque="false"
- name="Snapshot Floater View"
- tab_stop="false"
- top="0"
- visible="false"
- width="1024"/>
<tooltip_view top="0"
follows="all"
height="768"