diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-01 09:34:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-01 09:34:41 -0400 |
| commit | 90b56ee9fa95ca8cc15e3abc81977f504eb32c5b (patch) | |
| tree | 581e4ba644ebf770dbdab292ea9f10d4b9404cb6 /indra/newview/llfloaterimnearbychathandler.cpp | |
| parent | 130e4e510198147664a2377b62b22d8e42f00f04 (diff) | |
| parent | 49bef4e122e3ab4c82962e25f4ec1803c4e0c600 (diff) | |
merge changes for 3.5.0-beta7
Diffstat (limited to 'indra/newview/llfloaterimnearbychathandler.cpp')
| -rw-r--r-- | indra/newview/llfloaterimnearbychathandler.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llfloaterimnearbychathandler.cpp b/indra/newview/llfloaterimnearbychathandler.cpp index 0824b26406..9ce5e12897 100644 --- a/indra/newview/llfloaterimnearbychathandler.cpp +++ b/indra/newview/llfloaterimnearbychathandler.cpp @@ -605,11 +605,15 @@ void LLFloaterIMNearbyChatHandler::processChat(const LLChat& chat_msg, } //Don't show nearby toast, if conversation is visible and selected - if (im_box->getSelectedSession().isNull() && + if ((nearby_chat->hasFocus()) || + ((im_box->getSelectedSession().isNull() && ((LLFloater::isVisible(im_box) && !im_box->isMinimized() && im_box->isFrontmost()) - || (LLFloater::isVisible(nearby_chat) && !nearby_chat->isMinimized() && nearby_chat->isFrontmost()))) + || (LLFloater::isVisible(nearby_chat) && !nearby_chat->isMinimized() && nearby_chat->isFrontmost()))))) { - return; + if(nearby_chat->isMessagePaneExpanded()) + { + return; + } } //Will show toast when chat preference is set |