From 5db02993ef806d2d73ae3e3fde89c3405132a348 Mon Sep 17 00:00:00 2001 From: Wolfpup Lowenhar Date: Mon, 27 Sep 2010 20:20:09 -0400 Subject: [STORM-255] As a user I would like to disable incoming Group/IM toasts from showing up. This will also take care of STORM-221 since the person that would be affected by the toast cha now disable them. --- doc/contributions.txt | 6 ++++ indra/newview/app_settings/settings.xml | 22 +++++++++++++ indra/newview/llimview.cpp | 14 +++++++++ .../default/xui/en/panel_preferences_chat.xml | 36 ++++++++++++++++++++-- 4 files changed, 75 insertions(+), 3 deletions(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index bcf714b29a..210deb3cb1 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -742,6 +742,12 @@ Wilton Lundquist VWR-7682 Zai Lynch VWR-19505 +Wolfpup Lowenhar + SNOW-622 + SNOW-772 + STORM-255 + VWR-20741 + VWR-20933 Zarkonnen Decosta VWR-253 Zi Ree diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 33f5482e50..02e9a10fde 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2567,6 +2567,28 @@ Value 1 + DisableGroupToast + + Comment + Disable Incoming Group Toasts + Persist + 1 + Type + Boolean + Value + 0 + + DisableIMToast + + Comment + Disable Incoming IM Toasts + Persist + 1 + Type + Boolean + Value + 0 + DisplayAvatarAgentTarget Comment diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index c865dcf9a3..286231523a 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -131,6 +131,20 @@ void toast_callback(const LLSD& msg){ return; } + // *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("DisableGroupToast") + && session->isGroupSessionType()) + { + return; + } + if (gSavedSettings.getBOOL("DisableIMToast") + && !session->isGroupSessionType()) + { + return; + } + // Skip toasting if we have open window of IM with this session id LLIMFloater* open_im_floater = LLIMFloater::findInstance(msg["session_id"]); if (open_im_floater && open_im_floater->getVisible()) 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..3adc174aaf 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: + + Disable incoming notifications: + + + - + \ No newline at end of file -- cgit v1.2.3 From 2a869d52f189a31c185b93f6425dd3e3dd8e927f Mon Sep 17 00:00:00 2001 From: Wolfpup Lowenhar Date: Tue, 28 Sep 2010 14:14:10 -0400 Subject: update for STORM-255 to correct small issue with tool tip in pannel_preferences_chat.xml --- indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3adc174aaf..e36415832c 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -366,7 +366,7 @@ 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"> Date: Mon, 25 Oct 2010 11:43:50 -0400 Subject: Inverting settings and test so that telling other how to turn off the messages popping is easier as per discussion with Oz and Boroondas also correcting some minor spelling issues --- indra/newview/app_settings/settings.xml | 12 ++++++------ indra/newview/llimview.cpp | 4 ++-- .../skins/default/xui/en/panel_preferences_chat.xml | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3015dc523a..8ec812d59e 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2567,27 +2567,27 @@ Value 1 - DisableGroupToast + EnableGroupToast Comment - Disable Incoming Group Toasts + Enable Incoming Group Toasts Persist 1 Type Boolean Value - 0 + 1 - DisableIMToast + EnableIMToast Comment - Disable Incoming IM Toasts + Enable Incoming IM Toasts Persist 1 Type Boolean Value - 0 + 1 DisplayAvatarAgentTarget diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 410a20ffd0..79d524006d 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("DisableGroupToast") + if (!gSavedSettings.getBOOL("EnableGroupToast") && session->isGroupSessionType()) { return; } - if (gSavedSettings.getBOOL("DisableIMToast") + if (!gSavedSettings.getBOOL("EnableIMToast") && !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 e36415832c..77f3405ed9 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -394,27 +394,27 @@ left="280" height="10" width="180"> - Disable incoming notifications: + Enable Incoming Messages: Date: Tue, 26 Oct 2010 08:41:30 -0400 Subject: Addtition of Alexandrea Fride to contributions.text --- doc/contributions.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/contributions.txt b/doc/contributions.txt index e160c996b9..92809447d4 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -78,6 +78,8 @@ Aleric Inglewood Ales Beaumont VWR-9352 SNOW-240 +Alexandrea Fride + STORM-255 Alissa Sabre VWR-81 VWR-83 -- cgit v1.2.3 From 8bef9cc8137dc58b818c60dd1173959fcab40bd8 Mon Sep 17 00:00:00 2001 From: Wolfpup Lowenhar Date: Tue, 26 Oct 2010 09:32:56 -0400 Subject: Correction to pannel_preferences_chat.xml os it reads 'IM chat' instead of Im chat' --- indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 77f3405ed9..45d7633f73 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -409,7 +409,7 @@ Date: Wed, 27 Oct 2010 11:00:39 -0400 Subject: Made changes to setting names and in pannel_preferences_chat.xml for better understanding as per Esbee's comments in STORM-255 --- indra/newview/app_settings/settings.xml | 8 ++++---- indra/newview/llimview.cpp | 4 ++-- .../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 @@ Value 1 - EnableGroupToast + EnableGroupChatPopups Comment - Enable Incoming Group Toasts + Enable Incoming Group Chat Popups Persist 1 Type @@ -2578,10 +2578,10 @@ Value 1 - EnableIMToast + EnableIMChatPopups Comment - Enable Incoming IM Toasts + Enable Incoming IM Chat Popups Persist 1 Type 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: Date: Wed, 27 Oct 2010 22:27:59 -0400 Subject: STORM-255: removal if extra jira numbers in contributions.txt --- doc/contributions.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index 9b14187780..f4dc6cfbe4 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -755,11 +755,7 @@ Wilton Lundquist Zai Lynch VWR-19505 Wolfpup Lowenhar - SNOW-622 - SNOW-772 STORM-255 - VWR-20741 - VWR-20933 Zarkonnen Decosta VWR-253 Zi Ree -- cgit v1.2.3 From dafece369a796bc1501246c45008ddb9e4ccb765 Mon Sep 17 00:00:00 2001 From: Wolfpup Lowenhar Date: Fri, 29 Oct 2010 09:16:51 -0400 Subject: STORM-255 : Added missing JIRA issue to contributions.txt --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/contributions.txt b/doc/contributions.txt index f4dc6cfbe4..6c20e2c177 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -756,6 +756,7 @@ Zai Lynch VWR-19505 Wolfpup Lowenhar STORM-255 + STORM-256 Zarkonnen Decosta VWR-253 Zi Ree -- cgit v1.2.3 From d3bc9b3e752935bffc5e808fd41a43af45568788 Mon Sep 17 00:00:00 2001 From: Wolfpup Lowenhar Date: Mon, 1 Nov 2010 22:29:09 -0400 Subject: STORM-255 : Made changes to the tool tips for the check boxes in panel_prefferences_chat.xml --- indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 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 8a20c3cb16..85824c2576 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -436,7 +436,7 @@ top_delta="18" left="295" height="20" - tool_tip="Checking this will turn on Group Messages popping up" + tool_tip="Check to see popups when a Group Chat message arrives" width="400" />