diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-11-14 14:44:13 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-11-14 14:44:13 -0800 |
| commit | 76caf0238cb98c1abf69d56e122c71a1208b0d72 (patch) | |
| tree | 4f4a77ff8f11e7cc0a0f7af437b8699f0d035727 /indra/newview/llnotificationtiphandler.cpp | |
| parent | b403a9da23a2df73a657bfa835a3706a261af2fb (diff) | |
| parent | c24645f7b51ea27e1686bbe72470a9f3c09fc676 (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..fb0891c4c5 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->isMinimized() && nearby_chat_bar->getVisible() && nearby_chat->getVisible()) { return false; } |