diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-06 14:32:01 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-06 14:32:01 -0500 |
| commit | 94fbf99ac2e325a75a016e2f4c3b12cf8c82fc7c (patch) | |
| tree | 0f1aa2cbd03f47adf17f39e6bca8e7d5e4ac165c /indra/newview/llnearbychathandler.cpp | |
| parent | f1fd558dddf43277e024cb918c371d94d0764910 (diff) | |
| parent | a9686db3e606ec45d23265fd34a1a35498f39857 (diff) | |
merge changes for storm-714
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 |