diff options
| author | callum <none@none> | 2011-10-28 11:01:11 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-10-28 11:01:11 -0700 |
| commit | b94f45db81fa6a4625d58301a13f964996fa65bd (patch) | |
| tree | 1c9134e08ce22f4e122c48e3a746259a8f7ef470 /indra/newview/llnotificationtiphandler.cpp | |
| parent | d08d018323272866b189979d0e772d50cdece4b2 (diff) | |
| parent | f84a69a7e00f0eed49894e14336126849a9e7b29 (diff) | |
Merge with head
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 02b217fc94..2a08a29842 100644 --- a/indra/newview/llnotificationtiphandler.cpp +++ b/indra/newview/llnotificationtiphandler.cpp @@ -92,8 +92,7 @@ bool LLTipHandler::processNotification(const LLSD& notify) LLHandlerUtil::logToNearbyChat(notification, CHAT_SOURCE_SYSTEM); // don't show toast if Nearby Chat is opened - LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance< - LLNearbyChat>("nearby_chat", LLSD()); + LLNearbyChat* nearby_chat = LLNearbyChat::getInstance(); if (nearby_chat->getVisible()) { return false; |