merge

--HG-- branch : product-engine
2010-01-20 17:57:37 +02:00 · 2010-01-20 17:57:37 +02:00 · 361a54849f
parent fd9def311a a03e00799a
commit 361a54849f
1 changed files with 8 additions and 1 deletions
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@ -34,7 +34,14 @@
     name="background"
     tool_tip="Choose color for bubble chat"
     top_delta="1"
-     width="44" />
+     width="44">
+        <color_swatch.init_callback
+		     function="Pref.getUIColor"
+		     parameter="BackgroundChatColor" />
+		    <color_swatch.commit_callback
+		     function="Pref.applyUIColor"
+		     parameter="BackgroundChatColor" />
+    </color_swatch>
    <slider
     control_name="ChatBubbleOpacity"
     follows="left|top"