summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dyukov <adyukov@productengine.com>2009-12-08 21:15:28 +0200
committerAndrew Dyukov <adyukov@productengine.com>2009-12-08 21:15:28 +0200
commit4db25f9e02f79afaaaffdf205fe7dfe8785029d8 (patch)
treecb05ace9bc233a6e99f5046b6d08464f07fd0b07
parentabe3084db2487eb14e1b99b6a58d42f2829e3845 (diff)
Fixed normal bug EXT-2776 (Notification toasts of group chat pop up when group chat is
open but not in focus). --HG-- branch : product-engine
-rw-r--r--indra/newview/llimview.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 9790bdf9c0..d5d3b3b5ae 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -116,6 +116,13 @@ void toast_callback(const LLSD& msg){
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())
+ {
+ return;
+ }
+
LLSD args;
args["MESSAGE"] = msg["message"];
args["TIME"] = msg["time"];