diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-08 12:38:09 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-08 12:38:09 -0800 |
| commit | a312498260c05cedd6fc6ecb60f5f74d6b72be46 (patch) | |
| tree | 48f9de6ec835162fc9fe664647d1dfb96e6ca122 /indra/newview/llimview.cpp | |
| parent | c4eaaa3d6a08330863119d550d365315ba7526bb (diff) | |
| parent | b8a229032efe7c170bfd32e0d31b8b29aac82eec (diff) | |
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 9b14a77c08..9f24a5372f 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -121,7 +121,14 @@ void toast_callback(const LLSD& msg){ // 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->isInVisibleChain() && open_im_floater->hasFocus()) + if ( + open_im_floater + && open_im_floater->isInVisibleChain() + && open_im_floater->hasFocus() + && !open_im_floater->isMinimized() + && !(open_im_floater->getHost() + && open_im_floater->getHost()->isMinimized()) + ) { return; } |