summaryrefslogtreecommitdiff
path: root/indra/newview/llnotificationtiphandler.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2013-08-26 14:43:23 -0700
committersimon <none@none>2013-08-26 14:43:23 -0700
commit27d637d0f14fdfff496256222dc1343d2d7ee9ae (patch)
tree32b0f244e480cfddaa67fa89df40ad7c824adfc9 /indra/newview/llnotificationtiphandler.cpp
parent3f5e6280dbee3414d464a96a8d9d037c30adb123 (diff)
parent6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff)
Merge downstream code from CHUIStorm release
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"];