diff options
| author | alexanderpproductengine <alexanderpproductengine@lindenlab.com> | 2013-03-13 22:18:41 +0200 |
|---|---|---|
| committer | alexanderpproductengine <alexanderpproductengine@lindenlab.com> | 2013-03-13 22:18:41 +0200 |
| commit | bd8b0de8970387d2660af10220bbe53901c4aaed (patch) | |
| tree | d5a90af158596a1771bbe53ef836a3bb6fe9b6a0 /indra/newview/llimview.cpp | |
| parent | a5a9bd791c910314888b8dad84cd711993c60a40 (diff) | |
CHUI-831 ADD FIX Minimized conversation floater is not opened with Open Conversation Window preference if conversation receiving message is selected
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index d04e76c0b3..a266f06a20 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -199,13 +199,13 @@ void on_new_message(const LLSD& msg) // execution of the action LLFloaterIMContainer* im_box = LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container"); - - if (im_box->isFrontmost() && im_box->getSelectedSession() == session_id) + LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::getConversation(session_id); + + if (im_box->isFrontmost() && im_box->getSelectedSession() == session_id + && !(session_floater->getHost() ? im_box->isMinimized() : session_floater->isMinimized())) { return; } - - LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::getConversation(session_id); //session floater not focused (visible or not) bool session_floater_not_focused = session_floater && !session_floater->hasFocus(); |