Merge pull request #1421 from secondlife/DRTVWR-600-maint-A

Drtvwr 600 maint a

1 files changed, 8 insertions, 9 deletions

diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp
index 57446bb7a0..354a596e46 100644
--- a/indra/newview/llchatitemscontainerctrl.cpp
+++ b/indra/newview/llchatitemscontainerctrl.cpp
@@ -342,20 +342,19 @@ bool	LLFloaterIMNearbyChatToastPanel::handleMouseUp	(S32 x, S32 y, MASK mask)
 
 	S32 local_x = x - mMsgText->getRect().mLeft;
 	S32 local_y = y - mMsgText->getRect().mBottom;
-	
+
 	//if text_box process mouse up (ussually this is click on url) - we didn't show nearby_chat.
-	if (mMsgText->pointInView(local_x, local_y) )
+	if (mMsgText->pointInView(local_x, local_y))
 	{
-		if (mMsgText->handleMouseUp(local_x,local_y,mask) == true)
+		if (mMsgText->handleMouseUp(local_x, local_y, mask))
 			return true;
-		else
-		{
-			LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat")->showHistory();
-			return false;
-		}
+
+		LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat")->showHistory();
+		return false;
 	}
+
 	LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat")->showHistory();
-	return LLPanel::handleMouseUp(x,y,mask);
+	return LLPanel::handleMouseUp(x, y, mask);
 }
 
 void	LLFloaterIMNearbyChatToastPanel::setHeaderVisibility(EShowItemHeader e)