diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-19 16:47:05 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-19 16:47:05 -0400 |
| commit | 6691bf637e71f40d1bf12065c7caaf96bd9aaf50 (patch) | |
| tree | 554b6fbe0bd754f6fc10ee858a66232773c0fb6c /indra/newview/skins/default/xui/en | |
| parent | c1c087b508813ed0a07693decbab82e1cf3403ed (diff) | |
| parent | 2a869d52f189a31c185b93f6425dd3e3dd8e927f (diff) | |
Automated merge with file:///Users/oz/Work/viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 38 |
1 files changed, 34 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 31e160ec33..e36415832c 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -343,7 +343,7 @@ left="30" height="20" width="170" - top_pad="14"> + top_pad="7"> Show IMs in: </text> <text @@ -359,14 +359,14 @@ (requires restart) </text> <radio_group + follows="left|top" height="30" - layout="topleft" left="40" control_name="ChatWindow" name="chat_window" top_pad="0" tool_tip="Show your Instant Messages in separate floaters, or in one floater with many tabs (Requires restart)" - width="331"> + width="150"> <radio_item height="16" label="Separate windows" @@ -386,6 +386,36 @@ top_pad="5" width="150" /> </radio_group> + <text + name="disable_toast_label" + follows="left|top" + layout="topleft" + top_delta="-22" + left="280" + height="10" + width="180"> + Disable incoming notifications: + </text> + <check_box + control_name="DisableGroupToast" + name="DisableGroupToast" + label="Group chats" + layout="topleft" + top_delta="18" + left="295" + height="20" + tool_tip="Checking this will turn off Group Toasts poping up" + width="400" /> + <check_box + control_name="DisableIMToast" + name="DisableIMToast" + label="Im chats" + layout="topleft" + top_delta="22" + left="295" + height="20" + tool_tip="Checking this will turn off IM Chat Toasts poping up" + width="400" /> <check_box control_name="TranslateChat" enabled="true" @@ -488,4 +518,4 @@ name="Korean" value="ko" /> </combo_box> -</panel> +</panel>
\ No newline at end of file |