diff options
| author | leyla_linden <none@none> | 2011-10-11 16:17:23 -0700 |
|---|---|---|
| committer | leyla_linden <none@none> | 2011-10-11 16:17:23 -0700 |
| commit | 9f0890fc3a6931562843e4597c009778424ee5bc (patch) | |
| tree | 72271f9187731f6d5ef7e57dac1fecb10e2d6370 /indra/newview/llnearbychathandler.cpp | |
| parent | c1a9ca33b27f4e741eeacf781a09156009167ad3 (diff) | |
EXP-1293 Nearby chat toasts no longer appear.
EXP-1316 Minimized Snapshot floater has a snapshot preview image attached below.
EXP-1318 Clicking on nearby chat toasts should bring up Nearby Chat history
Diffstat (limited to 'indra/newview/llnearbychathandler.cpp')
| -rw-r--r-- | indra/newview/llnearbychathandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp index dcf444b048..7503164fe6 100644 --- a/indra/newview/llnearbychathandler.cpp +++ b/indra/newview/llnearbychathandler.cpp @@ -581,7 +581,7 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg, // WARNING - not sChatWatcher->post(notification); - if( nearby_chat->getVisible() + if( chat_bar->getVisible() && nearby_chat->getVisible() || ( chat_msg.mSourceType == CHAT_SOURCE_AGENT && gSavedSettings.getBOOL("UseChatBubbles") ) || !mChannel->getShowToasts() ) // to prevent toasts in Busy mode |