diff options
| author | callum <none@none> | 2011-11-11 12:29:49 -0800 |
|---|---|---|
| committer | callum <none@none> | 2011-11-11 12:29:49 -0800 |
| commit | 9d5de324421e8384321e209684aea21bbab33fc3 (patch) | |
| tree | d7eebf6a17c06aa6ca9aa2f9707ff66d9e73a986 /indra/newview/llnotificationtiphandler.cpp | |
| parent | e4e4977f5eab5aac24c32b569c5273c4be926cb2 (diff) | |
| parent | 738056c1a50b1189e73873ec56ca220edb4c11c4 (diff) | |
Merge with head
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; } |