diff options
| author | simon <none@none> | 2013-08-26 15:45:09 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-08-26 15:45:09 -0700 |
| commit | 90d1c5b3676fe4e8ea8668b41fdf92613d5f102d (patch) | |
| tree | 8d5afd9678fd44444bcc7b5d311b5cfb7abe5217 /indra/newview/llnotificationtiphandler.cpp | |
| parent | ac2dc34ed0abbac8d5a8eb7f887037fe387c6a7a (diff) | |
| parent | 27d637d0f14fdfff496256222dc1343d2d7ee9ae (diff) | |
Merge downstream code for CHUIStorm
Diffstat (limited to 'indra/newview/llnotificationtiphandler.cpp')
| -rwxr-xr-x | indra/newview/llnotificationtiphandler.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp index a85335f1ba..4ca961c1f9 100755 --- a/indra/newview/llnotificationtiphandler.cpp +++ b/indra/newview/llnotificationtiphandler.cpp @@ -83,13 +83,6 @@ bool LLTipHandler::processNotification(const LLNotificationPtr& notification) if (notification->canLogToChat()) { LLHandlerUtil::logToNearbyChat(notification, CHAT_SOURCE_SYSTEM); - - // don't show toast if Nearby Chat is opened - LLFloaterIMNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat"); - if (nearby_chat->isChatVisible()) - { - return false; - } } std::string session_name = notification->getPayload()["SESSION_NAME"]; |
