summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorYchebotarev ProductEngine <ychebotarev@productengine.com>2010-01-20 17:57:37 +0200
committerYchebotarev ProductEngine <ychebotarev@productengine.com>2010-01-20 17:57:37 +0200
commit361a54849fe52da11d2a5fb968d2b40ae02035ed (patch)
tree29f037570b251cc8947008bcebcf078023f213e4 /indra/newview
parentfd9def311a84f78c33013e52180deeb0582fd28a (diff)
parenta03e00799a2fb0a293c414870184bf4ec911eb45 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_advanced.xml9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 1e7acb566f..141678f7eb 100644
--- 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"