summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorangela@angelas-macbook-pro.local <angela@angelas-macbook-pro.local>2010-01-12 11:03:28 +0800
committerangela@angelas-macbook-pro.local <angela@angelas-macbook-pro.local>2010-01-12 11:03:28 +0800
commit2b2579cf1eaae860c9c288d921e29336364a4b0a (patch)
treefd431de80df3f9016d832ac63dbfe0d2896bf03c /indra/newview/skins
parent2128d0c90fe4185b6027080b6f80c2d973a072f0 (diff)
EXT-1645 [BSI] Selection Beam color preference (My Effects) isn't remembered after re-log EXT-1644 [BSI] Selection Beam color preference (My Effects) doesn't honor color choice -- reviewed by richard
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_general.xml15
1 files changed, 11 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index c98555735a..22c75a595e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -260,7 +260,7 @@
width="200">
My effects:
</text>
- <text
+ <text
type="string"
length="1"
follows="left|top"
@@ -270,16 +270,23 @@
name="title_afk_text"
width="190">
Away timeout:
- </text>
+ </text>
<color_swatch
- control_name="EffectColor"
+ can_apply_immediately="true"
follows="left|top"
height="50"
layout="topleft"
left="50"
name="effect_color_swatch"
tool_tip="Click to open Color Picker"
- width="38" />
+ width="38">
+ <color_swatch.init_callback
+ function="Pref.getUIColor"
+ parameter="EffectColor" />
+ <color_swatch.commit_callback
+ function="Pref.applyUIColor"
+ parameter="EffectColor" />
+ </color_swatch>
<combo_box
height="23"
layout="topleft"