diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-28 09:20:13 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-28 09:20:13 -0400 |
| commit | 23d3b834bb6fb8d269f4e80d94f9c88774464f17 (patch) | |
| tree | dd95441bf60508dfaa053b9d8bc4cf24af715fcb /indra/newview | |
| parent | 2a789e9c50cde72d20d31127059f0338ea967f89 (diff) | |
| parent | e2a531791ed2c311e6e95061175ce2a9151ccf9d (diff) | |
merge changes for storm-1334
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lldebugview.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/main_view.xml | 15 |
2 files changed, 11 insertions, 8 deletions
diff --git a/indra/newview/lldebugview.cpp b/indra/newview/lldebugview.cpp index b6d67899f8..aa5d4fc922 100644 --- a/indra/newview/lldebugview.cpp +++ b/indra/newview/lldebugview.cpp @@ -59,10 +59,12 @@ LLDebugView::LLDebugView(const LLDebugView::Params& p) void LLDebugView::init() { + // Horizontal percentage of screen (not window) to draw debug data in + static const F32 debug_console_percentage = 0.75; LLRect r; LLRect rect = getLocalRect(); - r.set(10, rect.getHeight() - 100, rect.getWidth()/2, 100); + r.set(10, rect.getHeight() - 100, rect.getWidth() * debug_console_percentage, 100); LLConsole::Params cp; cp.name("debug console"); cp.max_lines(20); 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" |