diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-28 15:56:23 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-28 15:56:23 -0700 |
| commit | d9512f70050730409026fbd43c8ca24ff13fa7bb (patch) | |
| tree | a7951829023ffef2c8175fac46a2ef0181630099 /indra/newview/skins | |
| parent | 158e647247f67344a5d7a9dde6ccc80bad615c9a (diff) | |
| parent | b2a6f4853b550af68a6f4487db00663639e20b38 (diff) | |
STORM-36 : merge with viewer-development
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index 31e160ec33..c009fd2931 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -308,6 +308,38 @@ width="95"> URLs </text> + <spinner + control_name="NearbyToastLifeTime" + decimal_digits="0" + follows="left|top" + height="23" + increment="1" + initial_value="23" + label="Nearby chat toasts life time:" + label_width="190" + layout="topleft" + left="290" + max_val="60" + min_val="1" + name="nearby_toasts_lifetime" + top_pad="33" + width="210" /> + <spinner + control_name="NearbyToastFadingTime" + decimal_digits="0" + follows="left|top" + height="23" + increment="1" + initial_value="3" + label="Nearby chat toasts fading time:" + label_width="190" + layout="topleft" + left_delta="00" + max_val="60" + min_val="0" + name="nearby_toasts_fadingtime" + top_pad="15" + width="210" /> <check_box control_name="PlayTypingAnim" height="16" @@ -316,7 +348,7 @@ layout="topleft" left="30" name="play_typing_animation" - top_pad="32" + top="205" width="400" /> <check_box enabled="false" |