viewer-release merge

1 files changed, 5 insertions, 8 deletions

diff --git a/indra/newview/llfloaterimnearbychathandler.cpp b/indra/newview/llfloaterimnearbychathandler.cpp
index cc00b6fd10..a8f815c389 100755
--- a/indra/newview/llfloaterimnearbychathandler.cpp
+++ b/indra/newview/llfloaterimnearbychathandler.cpp
@@ -187,14 +187,11 @@ void LLFloaterIMNearbyChatScreenChannel::deactivateToast(LLToast* toast)
 {
 	toast_vec_t::iterator pos = std::find(m_active_toasts.begin(), m_active_toasts.end(), toast->getHandle());
 
-	if (pos == m_active_toasts.end())
+	if (pos != m_active_toasts.end())
 	{
-		llassert(pos == m_active_toasts.end());
-		return;
+		LL_DEBUGS("NearbyChat") << "Deactivating toast" << llendl;
+		m_active_toasts.erase(pos);
 	}
-
-	LL_DEBUGS("NearbyChat") << "Deactivating toast" << llendl;
-	m_active_toasts.erase(pos);
 }
 
 void	LLFloaterIMNearbyChatScreenChannel::createOverflowToast(S32 bottom, F32 timer)
@@ -210,8 +207,8 @@ void LLFloaterIMNearbyChatScreenChannel::onToastDestroyed(LLToast* toast, bool a
 	{
 		// Viewer is quitting.
 		// Immediately stop processing chat messages (EXT-1419).
-	mStopProcessing = true;
-}
+		mStopProcessing = true;
+	}
 	else
 	{
 		// The toast is being closed by user (STORM-192).