summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorCinder <cinder.roxley@phoenixviewer.com>2014-06-04 12:52:27 -0600
committerCinder <cinder.roxley@phoenixviewer.com>2014-06-04 12:52:27 -0600
commit4170ae1027b1c8e5f63b0e6c4c9f919d8d3b66c0 (patch)
tree3a8976d682698aff6150b4fe360601a7ba63dbe9 /indra/newview/skins/default/xui/en
parent7e8d4ca3b1d96b5573aab99015f431147e6c6965 (diff)
STORM-2025: Part 2 - After consulting with Oz, remove subcategories of constants and fix highlighting
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml100
1 files changed, 5 insertions, 95 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 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"