diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-05 16:35:09 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-05 16:35:09 -0500 |
| commit | c3501a4f233410ca1740cbe0d29c3be18327ca52 (patch) | |
| tree | 8a1aa78d76435cbb4e8fe76c2eef81a79de272a0 /indra/newview/llnearbychathandler.cpp | |
| parent | 3b1a06b02434377a2772def8cc8fc0bf3407837d (diff) | |
| parent | e2f197b6f77592c84d0c2967cc0e8110c79f2f49 (diff) | |
Automated merge from viewer-development
Diffstat (limited to 'indra/newview/llnearbychathandler.cpp')
| -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 cebfac86e7..de5439e4e0 100644 --- a/indra/newview/llnearbychathandler.cpp +++ b/indra/newview/llnearbychathandler.cpp @@ -527,7 +527,8 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg, const LLSD &args) if( nearby_chat->getVisible() || ( chat_msg.mSourceType == CHAT_SOURCE_AGENT - && gSavedSettings.getBOOL("UseChatBubbles") ) ) + && gSavedSettings.getBOOL("UseChatBubbles") ) + || !mChannel->getShowToasts() ) // to prevent toasts in Busy mode return;//no need in toast if chat is visible or if bubble chat is enabled // Handle irc styled messages for toast panel |