diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-11-11 23:59:48 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-11-11 23:59:48 -0800 |
| commit | d8e1b48328017eba1c68bcc56a4f67085643988a (patch) | |
| tree | 9ac0775a19eb7d76f9f88c5a177aeb6d41044cfe /indra/newview/llnotificationtiphandler.cpp | |
| parent | db371c98248b790eed22a6295d33dd1d02adc602 (diff) | |
| parent | 8ff29a9e84b37e8962c4f485e0e1d678793f718e (diff) | |
Pull from viewer-experience
Diffstat (limited to 'indra/newview/llnotificationtiphandler.cpp')
| -rw-r--r-- | indra/newview/llnotificationtiphandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp index aa009a76fa..fb0891c4c5 100644 --- a/indra/newview/llnotificationtiphandler.cpp +++ b/indra/newview/llnotificationtiphandler.cpp @@ -95,7 +95,7 @@ bool LLTipHandler::processNotification(const LLSD& notify) // don't show toast if Nearby Chat is opened LLNearbyChat* nearby_chat = LLNearbyChat::getInstance(); LLNearbyChatBar* nearby_chat_bar = LLNearbyChatBar::getInstance(); - if (nearby_chat_bar->getVisible() && nearby_chat->getVisible()) + if (!nearby_chat_bar->isMinimized() && nearby_chat_bar->getVisible() && nearby_chat->getVisible()) { return false; } |