diff options
| author | leyla_linden <none@none> | 2011-10-11 16:18:24 -0700 |
|---|---|---|
| committer | leyla_linden <none@none> | 2011-10-11 16:18:24 -0700 |
| commit | 7a13cde7604977b32a9f3a027a0ce5b64d52ad9c (patch) | |
| tree | 5976f4729e2b082b9dac4fe3683d94f7509c13e8 /indra/newview/llnearbychathandler.cpp | |
| parent | ca9ea840951bcfeaf46f07c9ee0974408c21792a (diff) | |
| parent | 9f0890fc3a6931562843e4597c009778424ee5bc (diff) | |
Merge
Diffstat (limited to 'indra/newview/llnearbychathandler.cpp')
| -rw-r--r-- | indra/newview/llnearbychathandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp index dcf444b048..7503164fe6 100644 --- a/indra/newview/llnearbychathandler.cpp +++ b/indra/newview/llnearbychathandler.cpp @@ -581,7 +581,7 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg, // WARNING - not sChatWatcher->post(notification); - if( nearby_chat->getVisible() + if( chat_bar->getVisible() && nearby_chat->getVisible() || ( chat_msg.mSourceType == CHAT_SOURCE_AGENT && gSavedSettings.getBOOL("UseChatBubbles") ) || !mChannel->getShowToasts() ) // to prevent toasts in Busy mode |