diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-11-02 10:49:28 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-11-02 10:49:28 -0700 |
| commit | 2e2347d6ecb06cf4b125d625d238dfe8b9f181a4 (patch) | |
| tree | e4f61b25454e1c2d7d56b53142ea627dc5837915 | |
| parent | 405602baa624d916f200f2cd1e8343ba7b4633ff (diff) | |
| parent | 5b1f9f3c5e9176a971c942da7688d8b194b12ed3 (diff) | |
merge
| -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; } |