diff options
| author | angela <angela@lindenlab.com> | 2010-01-12 11:40:52 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-01-12 11:40:52 +0800 |
| commit | e9e651f5e4cf5dea29cf3f0340663ab404a46bcd (patch) | |
| tree | 046f0604d7f4fb284a75b613f937efb25f26ac67 /indra/newview/skins/default/xui | |
| parent | 82c1e6cce26b1584a3718a478b69d2618ad0c178 (diff) | |
| parent | 43d97298d5fdd3f5071df1e5bf70c6a59547ff06 (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/james/gooey
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_general.xml | 15 |
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" |