merge changes for STORM-1831

4 files changed, 64 insertions, 7 deletions

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 3ebb64e3fa..cb1d6aa32b 100755
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -56,7 +56,7 @@
 	<color
 	 name="Black"
 	 value="0 0 0 1" />
-	<colork
+	<color
 	 name="Black_10"
 	 value="0 0 0 0.1" />
 	<color
@@ -904,5 +904,57 @@
   <color
     name="ResizebarBody"
     value="0.208 0.208 0.208 1"/>
-    
+
+  <!-- syntax highlighting (LSL Scripts) -->
+  <color
+    name="SyntaxLslComment1Sided"
+    value=".8 .3 .15 1.0" />
+  <color
+    name="SyntaxLslComment2Sided"
+    value=".8 .3 .15 1.0" />
+  <color
+    name="SyntaxLslConstantFloat"
+    value=".3 .1 .5 1.0" />
+  <color
+    name="SyntaxLslConstantInteger"
+    value=".1 .1 .5 1.0" />
+  <color
+    name="SyntaxLslConstantKey"
+    value=".1 .3 .5 1.0" />
+  <color
+    name="SyntaxLslConstantRotation"
+    value=".2 .4 .2 1.0" />
+  <color
+    name="SyntaxLslConstantString"
+    value=".1 .3 .5 1.0" />
+  <color
+    name="SyntaxLslConstantVector"
+    value=".2 .4 .2 1.0" />
+  <color
+    name="SyntaxLslControlFlow"
+    value="0 0 .8 1.0" />
+  <color
+    name="SyntaxLslControlLabel"
+    value="0 0 .8 1.0" />
+  <color
+    name="SyntaxLslDataType"
+    value=".1 .3 .1 1.0" />
+   <color
+    name="SyntaxLslDeprecated"
+    value="0.9 0.0 0.66, 1.0" />
+  <color
+   name="SyntaxLslEvent"
+   value="0 .3 .5 1.0" />
+  <color
+   name="SyntaxLslFunction"
+   value=".3 0 .5 1.0" />
+  <color
+   name="SyntaxLslGodMode"
+   value="0.7 .2 .35 1.0" />
+  <color
+    name="SyntaxLslSection"
+    value=".5 .1 .3 1.0" />
+  <color
+    name="SyntaxLslStringLiteral"
+    value="0 .2 0 1.0" />
 </colors>
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 99b812a880..11172d8a3e 100755
--- a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
@@ -21,7 +21,6 @@
     layout="topleft"
     max_length="65536"
     name="region_debug_console_output"
-    show_line_numbers="false" 
     word_wrap="true"
     track_end="true"
     read_only="true">
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index bcdef96138..1a4f0aff73 100755
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -148,7 +148,7 @@
              name="Keyword Help..." />
         </menu>
     </menu_bar>
-    <text_editor
+    <script_editor
     left="0"
      type="string"
      length="1"
@@ -157,15 +157,14 @@
      height="376"
      ignore_tab="false"
      layout="topleft"
-     max_length="65536"
+     max_length="262144"
      name="Script Editor"
      text_readonly_color="DkGray"
      width="487"
-     show_line_numbers="true" 
      enable_tooltip_paste="true"
      word_wrap="true">
         Loading...
-    </text_editor>
+    </script_editor>
     <scroll_list
     top_pad="10"
     left="0"
diff --git a/indra/newview/skins/default/xui/en/script_editor.xml b/indra/newview/skins/default/xui/en/script_editor.xml
new file mode 100644
index 0000000000..b030a117fc
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/script_editor.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<script_editor
+    name="script_editor"
+    parse_urls="false"
+	show_context_menu="true"
+	show_line_numbers="true">
+</script_editor>