From 4472354b5454f758c467bb23190d1a84cf61d909 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 23 Apr 2012 18:48:43 -0700
Subject: SEC-995 FIX viewer is easily spammed to death by chat removed
 unnecessary string copies from chat message handling

---
 indra/llui/lltextbox.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llui/lltextbox.cpp')

diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp
index 6a905b7ec0..11cfa1d263 100644
--- a/indra/llui/lltextbox.cpp
+++ b/indra/llui/lltextbox.cpp
@@ -150,7 +150,7 @@ S32 LLTextBox::getTextPixelHeight()
 
 LLSD LLTextBox::getValue() const
 {
-	return LLSD(getText());
+	return getViewModel()->getValue();
 }
 
 BOOL LLTextBox::setTextArg( const std::string& key, const LLStringExplicit& text )
-- 
cgit v1.2.3


From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Fri, 29 Mar 2013 07:50:08 -0700
Subject: Update Mac and Windows breakpad builds to latest

---
 indra/llui/lltextbox.cpp | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 indra/llui/lltextbox.cpp

(limited to 'indra/llui/lltextbox.cpp')

diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From 04b84ce07dd5bc8364f948ef0004e3dc5328f1b4 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Mon, 14 Oct 2013 14:21:06 +0300
Subject: MAINT-3290 FIXED Handle correctly Mouse Capture for LLTextBox.

---
 indra/llui/lltextbox.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'indra/llui/lltextbox.cpp')

diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp
index 11cfa1d263..d175204e6d 100755
--- a/indra/llui/lltextbox.cpp
+++ b/indra/llui/lltextbox.cpp
@@ -59,11 +59,14 @@ BOOL LLTextBox::handleMouseDown(S32 x, S32 y, MASK mask)
 	}
 
 	if (!handled && mClickedCallback)
+	{
+		handled = TRUE;
+	}
+
+	if (handled)
 	{
 		// Route future Mouse messages here preemptively.  (Release on mouse up.)
 		gFocusMgr.setMouseCapture( this );
-
-		handled = TRUE;
 	}
 
 	return handled;
@@ -71,7 +74,7 @@ BOOL LLTextBox::handleMouseDown(S32 x, S32 y, MASK mask)
 
 BOOL LLTextBox::handleMouseUp(S32 x, S32 y, MASK mask)
 {
-	BOOL	handled = FALSE;
+	BOOL	handled = LLTextBase::handleMouseUp(x, y, mask);
 
 	if (getSoundFlags() & MOUSE_UP)
 	{
@@ -93,10 +96,6 @@ BOOL LLTextBox::handleMouseUp(S32 x, S32 y, MASK mask)
 			handled = TRUE;
 		}
 	}
-	else
-	{
-		handled = LLTextBase::handleMouseUp(x, y, mask);
-	}
 
 	return handled;
 }
-- 
cgit v1.2.3