From 2b2579cf1eaae860c9c288d921e29336364a4b0a Mon Sep 17 00:00:00 2001
From: "angela@angelas-macbook-pro.local" <angela@angelas-macbook-pro.local>
Date: Tue, 12 Jan 2010 11:03:28 +0800
Subject:   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

---
 .../skins/default/xui/en/panel_preferences_general.xml    | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

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"
-- 
cgit v1.2.3