summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-28 09:20:13 -0400
committerOz Linden <oz@lindenlab.com>2011-06-28 09:20:13 -0400
commit23d3b834bb6fb8d269f4e80d94f9c88774464f17 (patch)
treedd95441bf60508dfaa053b9d8bc4cf24af715fcb /indra/newview/skins/default/xui
parent2a789e9c50cde72d20d31127059f0338ea967f89 (diff)
parente2a531791ed2c311e6e95061175ce2a9151ccf9d (diff)
merge changes for storm-1334
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/main_view.xml15
1 files changed, 8 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 3ead67ca57..a7d1aa963c 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -135,6 +135,14 @@
name="login_panel_holder"
width="1024"/>
+ <debug_view follows="all"
+ left="0"
+ top="0"
+ mouse_opaque="false"
+ height="500"
+ name="DebugView"
+ width="1024"/>
+
<panel follows="all"
height="500"
left="0"
@@ -154,13 +162,6 @@
top="0"
width="1024"/>
</panel>
- <debug_view follows="all"
- left="0"
- top="0"
- mouse_opaque="false"
- height="500"
- name="DebugView"
- width="1024"/>
</layout_panel>
</layout_stack>
<panel mouse_opaque="false"