diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2011-11-01 18:11:21 +0200 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2011-11-01 18:11:21 +0200 |
| commit | 5b1f9f3c5e9176a971c942da7688d8b194b12ed3 (patch) | |
| tree | 93b3166acf91b125b9ba9ce5ba06486e7e4a5882 /indra | |
| parent | d86def6f03acc3b4a07a30a2f7912e6dc35edf27 (diff) | |
EXP-1489 FIXED (Cannot build notifications not being shown when chat floater closed with chat log toggled open)
- Need to check visibility of the floater itself, not only chat panel in it. So I added this check.
Diffstat (limited to 'indra')
| -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; } |