diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-08-27 10:37:02 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-08-27 10:37:02 -0400 |
| commit | a359d9d80c013b7c6cd594bb8d94b8950fdcdf55 (patch) | |
| tree | 7b687542962149ec448d436dbe62fe8ebac25d63 /indra/newview/llnotificationtiphandler.cpp | |
| parent | f46e07c14c11ffd26c0cf0794992d7c08d16fcd4 (diff) | |
| parent | 6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff) | |
merge changes for 3.6.4-release
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"]; |