From 816cf7db82f2e633631c334f44547714de6cbebc Mon Sep 17 00:00:00 2001
From: brad kittenbrink <brad@lindenlab.com>
Date: Thu, 29 Jul 2010 19:49:13 -0700
Subject: Adding a simple region debug console.

---
 .../xui/en/floater_region_debug_console.xml        | 37 ++++++++++++++++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml | 12 +++++++
 2 files changed, 49 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_region_debug_console.xml

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
new file mode 100644
index 0000000000..591d77340a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+  name="region_debug_console"
+  title="Region Debug"
+  layout="topleft"
+  min_height="300"
+  min_width="300"
+  height="400"
+  width="600">
+  <text_editor
+  left="10"
+   type="string"
+   length="1"
+   follows="left|top|right|bottom"
+   font="Monospace"
+   height="366"
+   width="576"
+   ignore_tab="false"
+   layout="topleft"
+   max_length="65536"
+   name="region_debug_console_output"
+   show_line_numbers="false" 
+   word_wrap="true">
+  </text_editor>
+  <line_editor
+   border_style="line"
+   border_thickness="1"
+   follows="left|top|right"
+   font="SansSerif"
+   height="19"
+   layout="topleft"
+   bottom_delta="20"
+   max_length="127"
+   name="region_debug_console_input"
+   top_delta="0"
+   width="394" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 3557318705..8a3785d7c1 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2542,6 +2542,18 @@
                  function="ToggleControl"
                  parameter="DoubleClickAutoPilot" />
             </menu_item_check>
+            <menu_item_check
+             label="Region Debug Console"
+             name="Region Debug Console"
+             shortcut="control|shift|`"
+             use_mac_ctrl="true">
+                <menu_item_check.on_check
+                 function="Floater.Visible"
+                 parameter="region_debug_console" />
+                <menu_item_check.on_click
+                 function="Floater.Toggle"
+                 parameter="region_debug_console" />
+            </menu_item_check>
 
             <menu_item_separator />
             <menu_item_check
-- 
cgit v1.2.3


From 5a6a792920bb0dee35bcd711bd786d907bda556a Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 24 Aug 2010 09:41:35 -0700
Subject: fix for sim console not staying scrolled to bottom

---
 indra/newview/skins/default/xui/en/floater_region_debug_console.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
index 591d77340a..976fa35d3c 100644
--- a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
@@ -9,6 +9,7 @@
   width="600">
   <text_editor
   left="10"
+  read_only="true" 
    type="string"
    length="1"
    follows="left|top|right|bottom"
@@ -18,6 +19,7 @@
    ignore_tab="false"
    layout="topleft"
    max_length="65536"
+    track_end="true" 
    name="region_debug_console_output"
    show_line_numbers="false" 
    word_wrap="true">
-- 
cgit v1.2.3


From 4b9abaaab9448df7e0773cdbaf1a5202a1f9e6c7 Mon Sep 17 00:00:00 2001
From: "Matthew Breindel (Falcon)" <falcon@lindenlab.com>
Date: Thu, 26 Aug 2010 17:09:15 -0700
Subject: Cleaned up the debug console a bit. Gave it a command history and
 proper scrolling to the bottom of the returned data.

---
 .../skins/default/xui/en/floater_region_debug_console.xml      | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
index 591d77340a..cf95257b0a 100644
--- a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
@@ -6,7 +6,8 @@
   min_height="300"
   min_width="300"
   height="400"
-  width="600">
+  width="600"
+  default_tab_group="1">
   <text_editor
   left="10"
    type="string"
@@ -20,11 +21,14 @@
    max_length="65536"
    name="region_debug_console_output"
    show_line_numbers="false" 
-   word_wrap="true">
+   word_wrap="true"
+   track_end="true"
+   read_only="true">
   </text_editor>
   <line_editor
    border_style="line"
    border_thickness="1"
+   tab_group="1" 
    follows="left|top|right"
    font="SansSerif"
    height="19"
@@ -33,5 +37,5 @@
    max_length="127"
    name="region_debug_console_input"
    top_delta="0"
-   width="394" />
+   width="576" />
 </floater>
-- 
cgit v1.2.3


From 301112ac7a89266d7378a413f15200ea1bb44d9e Mon Sep 17 00:00:00 2001
From: "Matthew Breindel (Falcon)" <falcon@lindenlab.com>
Date: Thu, 26 Aug 2010 17:14:22 -0700
Subject: Fixed bad merge.

---
 indra/newview/skins/default/xui/en/floater_region_debug_console.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
index b3bf28e285..bdb890f882 100644
--- a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
@@ -10,7 +10,6 @@
   default_tab_group="1">
   <text_editor
   left="10"
-  read_only="true" 
    type="string"
    length="1"
    follows="left|top|right|bottom"
-- 
cgit v1.2.3


From a16680abe30ef7a363e2931e75561058b7f53772 Mon Sep 17 00:00:00 2001
From: "Matthew Breindel (Falcon)" <falcon@lindenlab.com>
Date: Thu, 26 Aug 2010 17:29:33 -0700
Subject: Removed duplicate item in floater_region_Debug_console.xml

---
 indra/newview/skins/default/xui/en/floater_region_debug_console.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
index bdb890f882..cf95257b0a 100644
--- a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
@@ -19,7 +19,6 @@
    ignore_tab="false"
    layout="topleft"
    max_length="65536"
-    track_end="true" 
    name="region_debug_console_output"
    show_line_numbers="false" 
    word_wrap="true"
-- 
cgit v1.2.3


From 7e9572fab5643f52a44f06249109f7e77b656e3b Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Wed, 17 Nov 2010 15:21:58 +0200
Subject: STORM-589 FIXED Add a Preference that allows users to display the
 grid selection drop-down on the login screen

- Added a control_name for the "Show Grid Selection at login" checkbox
---
 indra/newview/skins/default/xui/en/panel_preferences_advanced.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 15d1222d00..cfc7a0d5ae 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -88,6 +88,7 @@
      top_pad="20"
      width="237"/>
     <check_box
+     control_name="ForceShowGrid"
      follows="top|left"
      height="15"
      label="Show Grid Selection at login"
-- 
cgit v1.2.3


From 14b2b796abf4e2f1538ca337f675166a22478868 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Wed, 17 Nov 2010 15:31:23 +0200
Subject: STORM-590 FIXED Add Preferences to enable the display of the Advanced
 and Development menus

- Added control_names for the "Show Advanced Menu" and "QAMode" checkboxes
---
 indra/newview/skins/default/xui/en/panel_preferences_advanced.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 15d1222d00..ae9711418e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -97,6 +97,7 @@
      top_pad="5"
      width="237"/>
     <check_box
+     control_name="UseDebugMenus"
      follows="top|left"
      height="15"
      label="Show Advanced Menu"
@@ -106,6 +107,7 @@
      top_pad="5"
      width="237"/>
     <check_box
+     control_name="QAMode"
      follows="top|left"
      height="15"
      label="Show Developer Menu"
-- 
cgit v1.2.3