diff options
| author | Don Kjer <don@lindenlab.com> | 2011-01-07 10:48:38 -0800 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-01-07 10:48:38 -0800 |
| commit | 829c2c86975dd80d13008c38246fa8ea0d10529c (patch) | |
| tree | e90bda161771de9f3fcd98e2806e8eed7c4222fc /indra/newview/llnearbychathandler.cpp | |
| parent | a9bc51e6416dd637080c0307de99d5e09d06dcc4 (diff) | |
| parent | c132d20a7433e2d09e3521a15497f661fcbd18b8 (diff) | |
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 |