diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-08-27 09:50:23 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-08-27 09:50:23 -0700 |
| commit | 99e0c35c40354a3ad4d9e6e0d92a73c15c844441 (patch) | |
| tree | a8f2f50548185f72893256258f1d28dd82bd5efb /indra/newview/llnotificationtiphandler.cpp | |
| parent | fd62242dd6e5fa464db07e0b8ebf3ab54a6067a2 (diff) | |
| parent | 0804ecb3551514d3321dfd4e3b17c3dab9693444 (diff) | |
Merge pull from richard/viewer-chui
Diffstat (limited to 'indra/newview/llnotificationtiphandler.cpp')
| -rw-r--r-- | indra/newview/llnotificationtiphandler.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp index a420c0d2ed..67fc9b27dc 100644 --- a/indra/newview/llnotificationtiphandler.cpp +++ b/indra/newview/llnotificationtiphandler.cpp @@ -85,8 +85,7 @@ bool LLTipHandler::processNotification(const LLNotificationPtr& notification) LLHandlerUtil::logToNearbyChat(notification, CHAT_SOURCE_SYSTEM); // don't show toast if Nearby Chat is opened - LLNearbyChat* nearby_chat = LLNearbyChat::getInstance(); - if (nearby_chat->isChatVisible()) + if (LLNearbyChat::instance().isChatVisible()) { return false; } |