Moving LSL highlighting colour info into .../skins/default/colors.xml where it makes more sense than its own xml file. Changing other functions to read it.

2 files changed, 53 insertions, 176 deletions

diff --git a/indra/newview/app_settings/keywords_lsl_colors.xml b/indra/newview/app_settings/keywords_lsl_colors.xml
deleted file mode 100644
index d150f0850f..0000000000
--- a/indra/newview/app_settings/keywords_lsl_colors.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-model href="llsd.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
-<llsd>
-    <map>
-        <key>types</key>
-        <map>
-            <key>color</key>
-            <array>
-                <real>0.1</real>
-                <real>0.3</real>
-                <real>0.1</real>
-            </array>
-        </map>
-        
-        <key>constants</key>
-        <map>
-            <key>float</key>
-            <map>
-                <key>color</key>
-                <array>
-                    <real>0.3</real>
-                    <real>0.1</real>
-                    <real>0.5</real>
-                </array>
-            </map>
-            <key>integer</key>
-            <map>
-                <key>color</key>
-                <array>
-                    <real>0.1</real>
-                    <real>0.1</real>
-                    <real>0.5</real>
-                </array>
-            </map>
-            <key>key</key>
-            <map>
-                <key>color</key>
-                <array>
-                    <real>0.1</real>
-                    <real>0.3</real>
-                    <real>0.5</real>
-                </array>
-            </map>
-            <key>rotation</key>
-            <map>
-                <key>color</key>
-                <array>
-                    <real>0.4</real>
-                    <real>0.2</real>
-                    <real>0.4</real>
-                </array>
-            </map>
-            <key>string</key>
-            <map>
-                <key>color</key>
-                <array>
-                    <real>0.1</real>
-                    <real>0.3</real>
-                    <real>0.5</real>
-                </array>
-            </map>
-            <key>vector</key>
-            <map>
-                <key>color</key>
-                <array>
-                    <real>0.4</real>
-                    <real>0.2</real>
-                    <real>0.4</real>
-                </array>
-            </map>
-        </map>
- 
-        <key>misc</key>
-        <map>
-            <key>flow-control</key>
-            <map>
-                <key>color</key>
-                <array>
-                    <real>0.0</real>
-                    <real>0.0</real>
-                    <real>0.8</real>
-                </array>
-            </map>
-            
-            <key>comments_1_sided</key>
-            <map>
-                <key>color</key>
-                <array>
-                    <real>0.8</real>
-                    <real>0.3</real>
-                    <real>0.15</real>
-                </array>
-            </map>
-            
-            <key>comments_2_sided</key>
-            <map>
-                <key>color</key>
-                <array>
-                    <real>0.8</real>
-                    <real>0.3</real>
-                    <real>0.15</real>
-                </array>
-            </map>
-            
-            <key>flow-label</key>
-            <map>
-                <key>color</key>
-                <array>
-                    <real>0.0</real>
-                    <real>0.0</real>
-                    <real>0.8</real>
-                </array>
-            </map>
-            
-            <key>double_quotation_marks</key>
-            <map>
-                <key>color</key>
-                <array>
-                    <real>0.0</real>
-                    <real>0.2</real>
-                    <real>0.0</real>
-                </array>
-            </map>
-            
-            <key>sections</key>
-            <map>
-                <key>color</key>
-                <array>
-                    <real>0.5</real>
-                    <real>0.1</real>
-                    <real>0.3</real>
-                </array>
-            </map>
-        </map>
-
-        <key>events</key>
-        <map>
-            <key>color</key>
-            <array>
-                <real>0.0</real>
-                <real>0.3</real>
-                <real>0.5</real>
-            </array>
-        </map>
-        
-        <key>functions</key>
-        <map>
-            <key>color</key>
-            <array>
-                <real>0.5</real>
-                <real>0.0</real>
-                <real>0.15</real>
-            </array>
-        </map>
-        
-        <key>deprecated</key>
-        <map>
-            <key>color</key>
-            <array>
-                <real>0.9</real>
-                <real>0.4</real>
-                <real>0.55</real>
-            </array>
-        </map>
-        
-        <key>god_mode</key>
-        <map>
-            <key>color</key>
-            <array>
-                <real>0.7</real>
-                <real>0.2</real>
-                <real>0.35</real>
-            </array>
-        </map>
-    </map>
-</llsd>
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index a9176595c7..fe794c18c5 100755
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -884,4 +884,57 @@
   <color
     name="blue"
     value="0 0 1 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=".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>