diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-09-10 10:48:45 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-09-10 10:48:45 -0700 |
| commit | 5b72a2d7fb917ed6d60ea27873077dca728a9e71 (patch) | |
| tree | bc4a2147773faee64a971910cc77fa4b4ee8432b /indra/newview/llnotificationtiphandler.cpp | |
| parent | 4869e0c269deafa44874a0110cc1f06bdc310407 (diff) | |
| parent | d79037017e3a1627be848b9162f28ae16fcb6004 (diff) | |
Pull merge from richard/viewer-chui
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 ef6668247c..a293e6acb6 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 = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat"); - if (nearby_chat && nearby_chat->isChatVisible()) + if (nearby_chat->isChatVisible()) { return false; } |