diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-11-02 13:44:18 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-11-02 13:44:18 -0700 |
| commit | 353f7ea61873d9f35685a59b4102899b4a9e596e (patch) | |
| tree | 3ca2964682d7e5e23b7a178a854c567c7c5384d9 /indra/newview/llnotificationtiphandler.cpp | |
| parent | 139c13bdc0387f50d9f3a71737a95a4585bc471c (diff) | |
| parent | 334d8f4076b4045e8fd4ede5fd9d31f0b185ded4 (diff) | |
Pull from richard/viewer-experience
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; } |