From 4170ae1027b1c8e5f63b0e6c4c9f919d8d3b66c0 Mon Sep 17 00:00:00 2001
From: Cinder <cinder.roxley@phoenixviewer.com>
Date: Wed, 4 Jun 2014 12:52:27 -0600
Subject: STORM-2025: Part 2 - After consulting with Oz, remove subcategories
 of constants and fix highlighting

---
 indra/newview/skins/default/colors.xml             |  17 +---
 .../default/xui/en/floater_script_ed_prefs.xml     | 100 ++-------------------
 2 files changed, 6 insertions(+), 111 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index bdbece33e0..3a1f3d4e0a 100755
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -919,23 +919,8 @@
     name="SyntaxLslComment"
     value=".8 .3 .15 1.0" />
   <color
-    name="SyntaxLslConstantFloat"
+    name="SyntaxLslConstant"
     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" />
diff --git a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
index a076839c09..8ae0df22b1 100644
--- a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
@@ -268,15 +268,15 @@
      label_height="0"
      layout="topleft"
      left="170"
-     name="i_constant"
+     name="constant"
      top_pad="10"
      width="44" >
         <color_swatch.init_callback
          function="ScriptPref.getUIColor"
-         parameter="SyntaxLslConstantInteger" />
+         parameter="SyntaxLslConstant" />
         <color_swatch.commit_callback
          function="ScriptPref.applyUIColor"
-         parameter="SyntaxLslConstantInteger" />
+         parameter="SyntaxLslConstant" />
     </color_swatch>
     <text
      type="string"
@@ -286,100 +286,10 @@
      layout="topleft"
      left_pad="5"
      mouse_opaque="false"
-     name="i_constant_label"
+     name="constant_label"
      top_delta="5"
      width="100">
-    Integer Const
-    </text>
-    <color_swatch
-     can_apply_immediately="true"
-     follows="left|top"
-     height="24"
-     label_height="0"
-     layout="topleft"
-     left="170"
-     name="s_constant"
-     top_pad="10"
-     width="44" >
-        <color_swatch.init_callback
-         function="ScriptPref.getUIColor"
-         parameter="SyntaxLslConstantString" />
-        <color_swatch.commit_callback
-         function="ScriptPref.applyUIColor"
-         parameter="SyntaxLslConstantString" />
-    </color_swatch>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_pad="5"
-     mouse_opaque="false"
-     name="s_constant_label"
-     top_delta="5"
-     width="100">
-    String Const
-    </text>
-    <color_swatch
-     can_apply_immediately="true"
-     follows="left|top"
-     height="24"
-     label_height="0"
-     layout="topleft"
-     left="170"
-     name="f_constant"
-     top_pad="10"
-     width="44" >
-        <color_swatch.init_callback
-         function="ScriptPref.getUIColor"
-         parameter="SyntaxLslConstantFloat" />
-        <color_swatch.commit_callback
-         function="ScriptPref.applyUIColor"
-         parameter="SyntaxLslConstantFloat" />
-    </color_swatch>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_pad="5"
-     mouse_opaque="false"
-     name="f_constant_label"
-     top_delta="5"
-     width="100">
-    Float Const
-    </text>
-    <color_swatch
-     can_apply_immediately="true"
-     follows="left|top"
-     height="24"
-     label_height="0"
-     layout="topleft"
-     left="170"
-     name="c_constant"
-     top_pad="10"
-     width="44" >
-        <color_swatch.init_callback
-         function="ScriptPref.getUIColor"
-         parameter="SyntaxCompoundConstant" />
-        <color_swatch.commit_callback
-         function="ScriptPref.applyUIColor"
-         parameter="SyntaxCompoundConstant" />
-    </color_swatch>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_pad="5"
-     mouse_opaque="false"
-     name="c_constant_label"
-     top_delta="5"
-     width="100">
-    Compound
+    Constant
     </text>
     <color_swatch
      can_apply_immediately="true"
-- 
cgit v1.2.3