diff options
| author | Richard Linden <none@none> | 2011-11-14 15:39:41 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-14 15:39:41 -0800 |
| commit | 3c5cdd2948d4c215d70a86a1cab12ae55d3958b9 (patch) | |
| tree | de94b58ecd23ef5d8e4304602dc8b55a1cc96bd6 /indra/newview/llnotificationtiphandler.cpp | |
| parent | 7766ccb7731a596d6716e9d0def90b3d7da5fcf3 (diff) | |
| parent | 98755a62bb414f23919e003101153c20d3ab3f72 (diff) | |
Automated merge with http://hg.secondlife.com/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; } |