diff options
author | Aimee Linden <aimee@lindenlab.com> | 2010-02-05 16:23:13 +0000 |
---|---|---|
committer | Aimee Linden <aimee@lindenlab.com> | 2010-02-05 16:23:13 +0000 |
commit | fc9099a0faef9f077b7986651f953998d6b9ac0c (patch) | |
tree | d192c0e25d250c20faae00519ce3decb0d099340 /indra/newview/llnearbychathandler.cpp | |
parent | da44a78e6a899324ca9dad6bae6e0d6fc8b73dcb (diff) | |
parent | 166ac89de9bcf951103cbf2551a133ebe9e43035 (diff) |
merge
Diffstat (limited to 'indra/newview/llnearbychathandler.cpp')
-rw-r--r-- | indra/newview/llnearbychathandler.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp index be48770567..29e3c66684 100644 --- a/indra/newview/llnearbychathandler.cpp +++ b/indra/newview/llnearbychathandler.cpp @@ -345,8 +345,10 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg, const LLSD &args) // tmp_chat.mFromName = tmp_chat.mFromID.asString(); } nearby_chat->addMessage(chat_msg, true, args); - if(nearby_chat->getVisible()) - return;//no need in toast if chat is visible + if( nearby_chat->getVisible() + || ( chat_msg.mSourceType == CHAT_SOURCE_AGENT + && gSavedSettings.getBOOL("UseChatBubbles") ) ) + return;//no need in toast if chat is visible or if bubble chat is enabled // Handle irc styled messages for toast panel if (tmp_chat.mChatStyle == CHAT_STYLE_IRC) |