diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-20 15:33:09 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-20 15:33:09 -0400 |
| commit | 4b1c1e4e02eb89cf54857c9071e3cbaad348a49b (patch) | |
| tree | b5adfcd2a4b9fc4986d2257e0796d881202478da /indra/newview/skins | |
| parent | 04e78ce4fdd3bbc0e4daa1daabbff2de1c425601 (diff) | |
| parent | 2474385a2a447a9e9d05bb170c6f7a4be8d43249 (diff) | |
merge changes for storm-1931
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 20 |
1 files changed, 16 insertions, 4 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 9db3816c92..e737938493 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -30,12 +30,23 @@ </check_box> <check_box + control_name="PlayChatAnim" + height="16" + initial_value="true" + label="Play chat animations when chatting in nearby chat" + layout="topleft" + top_pad="2" + name="play_chat_animation" + width="330"> + </check_box> + + <check_box enabled="false" height="16" label="Email me IMs when I'm offline" layout="topleft" name="send_im_to_email" - top_pad="6" + top_pad="2" width="330"> </check_box> @@ -45,7 +56,7 @@ label="Only friends and groups can call or IM me" layout="topleft" name="voice_call_friends_only_check" - top_pad="6" + top_pad="2" width="350"> </check_box> @@ -98,6 +109,7 @@ height="165" layout="topleft" left="13" + top_pad="12" width="517"> <text @@ -284,7 +296,7 @@ height="13" name="notifications_alert" width="500" - top_pad="9" + top_pad="7" visible="true" text_color="DrYellow"> To temporarily stop all notifications, use Communicate > Do Not Disturb. @@ -297,7 +309,7 @@ height="50" layout="topleft" left="13" - top_pad="10" + top_pad="7" width="517"> <text |