Update syntax color floater with recent changes.

1 files changed, 35 insertions, 36 deletions

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 b76c34f4a0..9a65a7e158 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
@@ -2,13 +2,13 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
- height="400"
+ height="354"
  layout="topleft"
  name="floater_script_colors"
  help_topic="script_colors"
  save_rect="true"
  title="Customize script colors"
- width="300">
+ width="320">
     <text
      follows="left|top"
      height="15"
@@ -176,16 +176,16 @@
      height="24"
      label_height="0"
      layout="topleft"
-     left="15"
-     name="comment"
-     top_pad="10"
+     left="190"
+     name="string_literal"
+     top="45"
      width="44" >
         <color_swatch.init_callback
          function="ScriptPref.getUIColor"
-         parameter="SyntaxLslComment" />
+         parameter="SyntaxLslStringLiteral" />
         <color_swatch.commit_callback
          function="ScriptPref.applyUIColor"
-         parameter="SyntaxLslComment" />
+         parameter="SyntaxLslStringLiteral" />
     </color_swatch>
     <text
      type="string"
@@ -195,10 +195,10 @@
      layout="topleft"
      left_pad="5"
      mouse_opaque="false"
-     name="comment_label"
+     name="string_literal_label"
      top_delta="5"
      width="100">
-    Comment
+    String Literals
     </text>
     <color_swatch
      can_apply_immediately="true"
@@ -206,16 +206,16 @@
      height="24"
      label_height="0"
      layout="topleft"
-     left="170"
-     name="string_literal"
-     top="45"
+     left="190"
+     name="constant"
+     top_pad="10"
      width="44" >
         <color_swatch.init_callback
          function="ScriptPref.getUIColor"
-         parameter="SyntaxLslStringLiteral" />
+         parameter="SyntaxLslConstant" />
         <color_swatch.commit_callback
          function="ScriptPref.applyUIColor"
-         parameter="SyntaxLslStringLiteral" />
+         parameter="SyntaxLslConstant" />
     </color_swatch>
     <text
      type="string"
@@ -225,28 +225,27 @@
      layout="topleft"
      left_pad="5"
      mouse_opaque="false"
-     name="string_literal_label"
+     name="constant_label"
      top_delta="5"
      width="100">
-    String Literals
+    Constant
     </text>
-
     <color_swatch
      can_apply_immediately="true"
      follows="left|top"
      height="24"
      label_height="0"
      layout="topleft"
-     left="170"
-     name="constant"
+     left="190"
+     name="flow_control"
      top_pad="10"
      width="44" >
         <color_swatch.init_callback
          function="ScriptPref.getUIColor"
-         parameter="SyntaxLslConstant" />
+         parameter="SyntaxLslControlFlow" />
         <color_swatch.commit_callback
          function="ScriptPref.applyUIColor"
-         parameter="SyntaxLslConstant" />
+         parameter="SyntaxLslControlFlow" />
     </color_swatch>
     <text
      type="string"
@@ -256,10 +255,10 @@
      layout="topleft"
      left_pad="5"
      mouse_opaque="false"
-     name="constant_label"
+     name="flow_control_label"
      top_delta="5"
      width="100">
-    Constant
+    Flow Control
     </text>
     <color_swatch
      can_apply_immediately="true"
@@ -267,16 +266,16 @@
      height="24"
      label_height="0"
      layout="topleft"
-     left="170"
-     name="flow_control"
+     left="190"
+     name="function"
      top_pad="10"
      width="44" >
         <color_swatch.init_callback
          function="ScriptPref.getUIColor"
-         parameter="SyntaxLslControlFlow" />
+         parameter="SyntaxLslFunction" />
         <color_swatch.commit_callback
          function="ScriptPref.applyUIColor"
-         parameter="SyntaxLslControlFlow" />
+         parameter="SyntaxLslFunction" />
     </color_swatch>
     <text
      type="string"
@@ -286,10 +285,10 @@
      layout="topleft"
      left_pad="5"
      mouse_opaque="false"
-     name="flow_control_label"
+     name="function_label"
      top_delta="5"
      width="100">
-    Flow Control
+    Function
     </text>
     <color_swatch
      can_apply_immediately="true"
@@ -297,16 +296,16 @@
      height="24"
      label_height="0"
      layout="topleft"
-     left="170"
-     name="function"
+     left="190"
+     name="comment"
      top_pad="10"
      width="44" >
         <color_swatch.init_callback
          function="ScriptPref.getUIColor"
-         parameter="SyntaxLslFunction" />
+         parameter="SyntaxLslComment" />
         <color_swatch.commit_callback
          function="ScriptPref.applyUIColor"
-         parameter="SyntaxLslFunction" />
+         parameter="SyntaxLslComment" />
     </color_swatch>
     <text
      type="string"
@@ -316,16 +315,16 @@
      layout="topleft"
      left_pad="5"
      mouse_opaque="false"
-     name="function_label"
+     name="comment_label"
      top_delta="5"
      width="100">
-    Function
+    Comment
     </text>
 
     <script_editor
      left="8"
      right="-8"
-     top="250"
+     top="176"
      bottom="-8"
      type="string"
      length="1"