diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-02-05 12:42:33 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-05 12:42:33 -0800 |
| commit | a8b6083f47e59bdff00cb5204fc42ef214f3567a (patch) | |
| tree | 642e1d53d4c77d0155315ba65daff746622e6dec /indra/newview/llnearbychathandler.cpp | |
| parent | b8a46c81eefc3da66fc1a1c3ed9bfbf4418b535d (diff) | |
| parent | 41ab7853536dcbbf2b64d06b754617ee6bc7e896 (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) |