diff options
| author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-11-08 22:05:01 +0200 |
|---|---|---|
| committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-11-08 22:05:01 +0200 |
| commit | b8a229032efe7c170bfd32e0d31b8b29aac82eec (patch) | |
| tree | 793d6fc8d8fc2a0f4420698b2e74fb53002e66a5 /indra/newview/llimview.cpp | |
| parent | 4ec5ee63e28a427d88dfc0329151eacaf375fdb6 (diff) | |
| parent | 93f9c6991819f53ea03b36dff1af77bbd74ff43b (diff) | |
merging into latest changes
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 d5f1e81933..11337c358f 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; } |