diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-08-27 16:51:05 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-08-27 16:51:05 -0700 |
| commit | d29268f331380eb89224c5b0168bf89bd0116422 (patch) | |
| tree | 47973dc2fbe434066e1de0c1695c3033eb76cc80 /indra/newview/llnotificationtiphandler.cpp | |
| parent | eaf847e60df3c078d15f8991e9448b06ffa83bf7 (diff) | |
| parent | 6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (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"]; |