diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-05 17:53:37 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-05 17:53:37 -0500 |
| commit | eb0b8ab3ea19617a52881191bab21bfedcc5696d (patch) | |
| tree | 769aa9bd60f45109f54672db93a4fa22fcde6510 /indra/newview/llnearbychathandler.cpp | |
| parent | df0a0312fb1923164c6d693c675a365bb8cef1df (diff) | |
| parent | d5a0c56bf5d933b7cee072cbc1851a626e672ded (diff) | |
merge changes for storm-825
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 |