diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-01 17:36:46 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-01 17:36:46 -0700 |
| commit | 1d6957ce09f92df6c0766162de1a84547f40e3bd (patch) | |
| tree | 34b15b0722b838702d1185b96b239a46a7fcc7c9 /indra/newview/llnotificationtiphandler.cpp | |
| parent | c6d981a8430f02a5a78afbeece9afeb7b2f108c8 (diff) | |
| parent | 898ec6cd362cd92ceef8dca8faf3fb8ed119b1be (diff) | |
merge of latest changes
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 507c6686fd..a420c0d2ed 100644 --- a/indra/newview/llnotificationtiphandler.cpp +++ b/indra/newview/llnotificationtiphandler.cpp @@ -86,7 +86,7 @@ bool LLTipHandler::processNotification(const LLNotificationPtr& notification) // don't show toast if Nearby Chat is opened LLNearbyChat* nearby_chat = LLNearbyChat::getInstance(); - if (!nearby_chat->isMinimized() && nearby_chat->getVisible()) + if (nearby_chat->isChatVisible()) { return false; } |