diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-12-13 10:23:22 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-12-13 10:23:22 -0500 |
| commit | d5f48181b50d9e941abafd76692359869e71a36d (patch) | |
| tree | 66f2a744ca09c0ff483038ed639a5dd552cd5272 /indra/newview/llnotificationtiphandler.cpp | |
| parent | 34b1982d33c83bb58c95bcedf36c9b5cd097584f (diff) | |
| parent | dbc91a7fac9513bdd879c5c2dc82208e08eaad2d (diff) | |
merge up to latest viewer-development
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; } |