diff options
author | Oz Linden <oz@lindenlab.com> | 2010-10-08 10:47:25 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-10-08 10:47:25 -0400 |
commit | bb74487c859acccb8f88002630606419761136e4 (patch) | |
tree | eadeabd044a9fa06c789b957d9b2c823c47617dd /indra/newview/llnotificationtiphandler.cpp | |
parent | 970ce1e1626c205302c4085610819571c1ce79f4 (diff) | |
parent | d25a30e55b7e6a20173c3a53891489adc5610d72 (diff) |
Merge fixes for VWR-23047, VWR-20911, and SNOW-748
Diffstat (limited to 'indra/newview/llnotificationtiphandler.cpp')
-rw-r--r-- | indra/newview/llnotificationtiphandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp index 94612975a2..02b217fc94 100644 --- a/indra/newview/llnotificationtiphandler.cpp +++ b/indra/newview/llnotificationtiphandler.cpp @@ -96,7 +96,7 @@ bool LLTipHandler::processNotification(const LLSD& notify) LLNearbyChat>("nearby_chat", LLSD()); if (nearby_chat->getVisible()) { - return true; + return false; } } @@ -121,7 +121,7 @@ bool LLTipHandler::processNotification(const LLSD& notify) // don't spawn toast for inventory accepted/declined offers if respective IM window is open (EXT-5909) if (!LLHandlerUtil::canSpawnToast(notification)) { - return true; + return false; } LLToastPanel* notify_box = LLToastPanel::buidPanelFromNotification(notification); @@ -144,7 +144,7 @@ bool LLTipHandler::processNotification(const LLSD& notify) { mChannel->killToastByNotificationID(notification->getID()); } - return true; + return false; } //-------------------------------------------------------------------------- |