diff options
| author | Richard Linden <none@none> | 2011-10-26 10:10:24 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-26 10:10:24 -0700 |
| commit | 24ab1e3f5413514a81e86e3c930a2e2a05bbe3eb (patch) | |
| tree | b92130be7f0dd30bdfced479ae7205a1c1e8b1b2 /indra | |
| parent | 17194cab5db3a956d9768f89238e63bc30b0a9a6 (diff) | |
| parent | 9d988f4454556dd911b8cb131b38a7f39023fa0f (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra')
| -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 |