diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-12 18:18:34 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-12 18:18:34 -0800 |
| commit | 91781df3701da9852dbe87a4d5c9d5e3abf09987 (patch) | |
| tree | 02c2569e8ef761f847a20db679dc86b7614d7fde /indra/newview/llfloaterimnearbychathandler.cpp | |
| parent | 0e6139eb3d3af1e77df20f87deef427993bf2c61 (diff) | |
CHUI-486: Now toasts only appear when proper 'Chat Preference' setting is set to 'Pop Up Message'.
Diffstat (limited to 'indra/newview/llfloaterimnearbychathandler.cpp')
| -rw-r--r-- | indra/newview/llfloaterimnearbychathandler.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimnearbychathandler.cpp b/indra/newview/llfloaterimnearbychathandler.cpp index 0dfaa9174b..f382b65b1d 100644 --- a/indra/newview/llfloaterimnearbychathandler.cpp +++ b/indra/newview/llfloaterimnearbychathandler.cpp @@ -283,6 +283,12 @@ bool LLFloaterIMNearbyChatScreenChannel::createPoolToast() void LLFloaterIMNearbyChatScreenChannel::addChat(LLSD& chat) { + //Ignore Nearby Toasts + if(gSavedSettings.getString("NotificationNearbyChatOptions") != "0") + { + return; + } + //look in pool. if there is any message if(mStopProcessing) return; |