diff options
author | Richard Linden <none@none> | 2013-09-16 21:12:18 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-09-16 21:12:18 -0700 |
commit | fc8c3a4cf7368ad7ee78e817e8c116d09b7377d0 (patch) | |
tree | 7513b7d0b5651d5de6e1ca4873efdc4689d5245b /indra/newview/llnotificationtiphandler.cpp | |
parent | 5f7f84c7acb686659b2bdc9a018b18c2b23db3d0 (diff) | |
parent | fb82d0c4dbb6f6e3c58cca6ab69d638bda851b34 (diff) |
merge
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"]; |