merge changes for STORM-1831

2 files changed, 58 insertions, 3 deletions

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index f53995732f..77a8fc7e22 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
@@ -898,5 +898,60 @@
   <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="ResizebarBody"
+    value="0.208 0.208 0.208 1"/>
+ <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=".9 .4 .55 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/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index bcdef96138..d1b35dce9d 100755
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -157,7 +157,7 @@
      height="376"
      ignore_tab="false"
      layout="topleft"
-     max_length="65536"
+     max_length="262144"
      name="Script Editor"
      text_readonly_color="DkGray"
      width="487"