diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-11-28 10:13:34 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-11-28 10:13:34 -0500 |
| commit | 5374e544ed5888548bea334bd8ca7ca53372d031 (patch) | |
| tree | b73c80d7cdc6a78ad6caed46b9485f18b3f039a7 /indra/newview/llnotificationtiphandler.cpp | |
| parent | 8c86a08e72708e96dcf67830518187a00478bbfd (diff) | |
| parent | fb605a047aa1c6b293b9546a06ac800c53d109ba (diff) | |
merge
Diffstat (limited to 'indra/newview/llnotificationtiphandler.cpp')
| -rw-r--r-- | indra/newview/llnotificationtiphandler.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp index 2a08a29842..aa009a76fa 100644 --- a/indra/newview/llnotificationtiphandler.cpp +++ b/indra/newview/llnotificationtiphandler.cpp @@ -29,6 +29,7 @@ #include "llfloaterreg.h" #include "llnearbychat.h" +#include "llnearbychatbar.h" #include "llnotificationhandler.h" #include "llnotifications.h" #include "lltoastnotifypanel.h" @@ -93,7 +94,8 @@ bool LLTipHandler::processNotification(const LLSD& notify) // don't show toast if Nearby Chat is opened LLNearbyChat* nearby_chat = LLNearbyChat::getInstance(); - if (nearby_chat->getVisible()) + LLNearbyChatBar* nearby_chat_bar = LLNearbyChatBar::getInstance(); + if (nearby_chat_bar->getVisible() && nearby_chat->getVisible()) { return false; } |