diff options
| author | Eugene Mutavchi <emutavchi@productengine.com> | 2010-02-05 17:09:22 +0200 |
|---|---|---|
| committer | Eugene Mutavchi <emutavchi@productengine.com> | 2010-02-05 17:09:22 +0200 |
| commit | 3ee065838ac2aa87db617988f9d6459a1bcc7fdc (patch) | |
| tree | a2874df0acf1553d9927d9398f6bc20bfeb9726f /indra/newview/llnearbychathandler.cpp | |
| parent | 113ae58ef1774da61cf2766dec38bc5c3270ceaf (diff) | |
Fixed normal bug EXT-1622 ([BSI] When Chat Bubbles are enabled chat by users still shows in nearby chat toasts.)
--HG--
branch : product-engine
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) |