diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-01 22:02:29 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-01 22:02:29 -0700 |
| commit | 94c41b2c00230a9514530bcd70efbe6f057a4e13 (patch) | |
| tree | 405f551169b41126b5d9c93a483e8b4692916cf7 /indra/newview/llimview.cpp | |
| parent | 44f6b6ea47e843e10bcc3ce94f2c1aaa8f7f24fb (diff) | |
| parent | d3bc9b3e752935bffc5e808fd41a43af45568788 (diff) | |
STORM-255 : merge with viewer-development
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 164c51a9e0..857c27be63 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("EnableGroupChatPopups") + && session->isGroupSessionType()) + { + return; + } + if (!gSavedSettings.getBOOL("EnableIMChatPopups") + && !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()) |