diff options
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 8 | ||||
| -rw-r--r-- | indra/newview/llimview.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 14 |
3 files changed, 13 insertions, 13 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8ec812d59e..e5656c0877 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2567,10 +2567,10 @@ <key>Value</key> <integer>1</integer> </map> - <key>EnableGroupToast</key> + <key>EnableGroupChatPopups</key> <map> <key>Comment</key> - <string>Enable Incoming Group Toasts</string> + <string>Enable Incoming Group Chat Popups</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -2578,10 +2578,10 @@ <key>Value</key> <integer>1</integer> </map> - <key>EnableIMToast</key> + <key>EnableIMChatPopups</key> <map> <key>Comment</key> - <string>Enable Incoming IM Toasts</string> + <string>Enable Incoming IM Chat Popups</string> <key>Persist</key> <integer>1</integer> <key>Type</key> diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 256f2aa842..416e13ed74 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -134,12 +134,12 @@ void toast_callback(const LLSD& msg){ // *NOTE Skip toasting if the user disable it in preferences/debug settings ~Alexandrea LLIMModel::LLIMSession* session = LLIMModel::instance().findIMSession( msg["session_id"]); - if (!gSavedSettings.getBOOL("EnableGroupToast") + if (!gSavedSettings.getBOOL("EnableGroupChatPopups") && session->isGroupSessionType()) { return; } - if (!gSavedSettings.getBOOL("EnableIMToast") + if (!gSavedSettings.getBOOL("EnableIMChatPopups") && !session->isGroupSessionType()) { return; 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 45d7633f73..e8f36b5298 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -394,12 +394,12 @@ left="280" height="10" width="180"> - Enable Incoming Messages: + Enable Incoming Chat popups: </text> <check_box - control_name="EnableGroupToast" - name="EnableGroupToast" - label="Group chats" + control_name="EnableGroupChatPopups" + name="EnableGroupChatPopups" + label="Group Chats" layout="topleft" top_delta="18" left="295" @@ -407,9 +407,9 @@ tool_tip="Checking this will turn on Group Messages popping up" width="400" /> <check_box - control_name="EnableIMToast" - name="EnableIMToast" - label="IM chats" + control_name="EnableIMChatPopups" + name="EnableIMChatPopups" + label="IM Chats" layout="topleft" top_delta="22" left="295" |