diff options
| author | Richard Linden <none@none> | 2011-10-26 10:10:05 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-26 10:10:05 -0700 |
| commit | 9d988f4454556dd911b8cb131b38a7f39023fa0f (patch) | |
| tree | a46d907ad0efa887dc35dae1a0944ee5b29bc302 /indra/newview/llnearbychathandler.cpp | |
| parent | 94d34aef5b2862a587095a664b6d6f33079dcd93 (diff) | |
EXP-1461 FIX Incoming Nearby chat not visible in chat toasts/bubbles to user when chat window is minimized with chat history opened
Diffstat (limited to 'indra/newview/llnearbychathandler.cpp')
| -rw-r--r-- | indra/newview/llnearbychathandler.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp index 330a21ef65..c43c95a366 100644 --- a/indra/newview/llnearbychathandler.cpp +++ b/indra/newview/llnearbychathandler.cpp @@ -568,7 +568,8 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg, // WARNING - not sChatWatcher->post(notification); - if( chat_bar->getVisible() && nearby_chat->getVisible() + if( !chat_bar->isMinimized() + && nearby_chat->isInVisibleChain() || ( chat_msg.mSourceType == CHAT_SOURCE_AGENT && gSavedSettings.getBOOL("UseChatBubbles") ) || !mChannel->getShowToasts() ) // to prevent toasts in Busy mode |