diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-09-06 16:35:02 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-09-06 16:35:02 -0700 |
| commit | 26ae00acf7da222b9478fedcfe5746191116991a (patch) | |
| tree | 0098bae20732b74218ae580273503cbe40c3aa48 /indra/newview/llnotificationtiphandler.cpp | |
| parent | ee5e689331ff6ba44cebaf9e9fb48f7bc3f590c4 (diff) | |
| parent | 62eb7ec0301c0313cedc2fcb63df8779b22a6d26 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llnotificationtiphandler.cpp')
| -rw-r--r-- | indra/newview/llnotificationtiphandler.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp index 67fc9b27dc..ef6668247c 100644 --- a/indra/newview/llnotificationtiphandler.cpp +++ b/indra/newview/llnotificationtiphandler.cpp @@ -85,7 +85,8 @@ bool LLTipHandler::processNotification(const LLNotificationPtr& notification) LLHandlerUtil::logToNearbyChat(notification, CHAT_SOURCE_SYSTEM); // don't show toast if Nearby Chat is opened - if (LLNearbyChat::instance().isChatVisible()) + LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat"); + if (nearby_chat && nearby_chat->isChatVisible()) { return false; } |