summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorPaul ProductEngine <pguslisty@productengine.com>2011-11-11 14:04:44 +0200
committerPaul ProductEngine <pguslisty@productengine.com>2011-11-11 14:04:44 +0200
commit1d47d3d86380bfe2ae9d42c35843f48d3abe5155 (patch)
tree86740e65c440ef9be2a4587a600b9493ca21b418 /indra
parent2a19aa93e9ec9a6c59a11231694b1f910cf817ea (diff)
EXP-1489 FIXED (Cannot build notifications not being shown when chat floater closed with chat log toggled open)
Reason: There is a case when the chat floater is minimized while its visibility = true as well as its chat panel visibility = true. In this case notification won't be shown to the user. It will be shown in chat history which is in minimized floater. Solution: Check for a floater minimized state.
Diffstat (limited to 'indra')
-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;
}