summaryrefslogtreecommitdiff
path: root/indra/newview/llnotificationtiphandler.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-09-09 20:19:36 -0700
committerRichard Linden <none@none>2013-09-09 20:19:36 -0700
commitddd9d1396cd378cbcd332d26d8b6b7092716c1bc (patch)
tree767a40da9fdd2f3ae0c89b1d6cd5135884c4e8c9 /indra/newview/llnotificationtiphandler.cpp
parent21ab67416d471a90b343052c986478c9dd65ae79 (diff)
parent52da9f5f49e0e300943abc3afa6944e6bee0cdd1 (diff)
merge
Diffstat (limited to 'indra/newview/llnotificationtiphandler.cpp')
-rwxr-xr-xindra/newview/llnotificationtiphandler.cpp7
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"];