summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-11-11 12:13:08 -0800
committerLeslie Linden <leslie@lindenlab.com>2011-11-11 12:13:08 -0800
commit798461f5e25dd88a520c68a05fcac40abfbac519 (patch)
tree57263b24d26286a94e7d57efcc252001b35dcd9f
parent1b56b7d2e5ad2b5c4ca2c733b25d1fd7dc78f634 (diff)
parent1d47d3d86380bfe2ae9d42c35843f48d3abe5155 (diff)
EXP-1489 fix from Paul PE
-rw-r--r--indra/newview/llnotificationtiphandler.cpp2
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;
}