From a74cadff8369ab5779877af6f1b030e1cc40e961 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 23 Oct 2020 16:05:31 +0300
Subject: SL-14149 FIXED The text is displayed black after double-clicking on
 it

---
 indra/llui/lltextbase.cpp | 6 ++++++
 indra/llui/lltextbase.h   | 2 +-
 indra/llui/lltextbox.cpp  | 4 +++-
 3 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index ff72417867..d92f10bdbb 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -184,6 +184,7 @@ LLTextBase::LLTextBase(const LLTextBase::Params &p)
 	mFontShadow(p.font_shadow),
 	mPopupMenuHandle(),
 	mReadOnly(p.read_only),
+	mSkipTripleClick(false),
 	mSkipLinkUnderline(p.skip_link_underline),
 	mSpellCheck(p.spellcheck),
 	mSpellCheckStart(-1),
@@ -1017,6 +1018,11 @@ BOOL LLTextBase::handleMouseDown(S32 x, S32 y, MASK mask)
 	// handle triple click
 	if (!mTripleClickTimer.hasExpired())
 	{
+		if (mSkipTripleClick)
+		{
+			return TRUE;
+		}
+		
 		S32 real_line = getLineNumFromDocIndex(mCursorPos, false);
 		S32 line_start = -1;
 		S32 line_end = -1;
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 4e966b7cef..2e2e1b9833 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -699,7 +699,7 @@ protected:
 	bool						mPlainText;			// didn't use Image or Icon segments
 	bool						mAutoIndent;
 	S32							mMaxTextByteLength;	// Maximum length mText is allowed to be in bytes
-
+	bool						mSkipTripleClick;
 	bool						mSkipLinkUnderline;
 
 	// support widgets
diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp
index 0afd32f332..4dc2a6a597 100644
--- a/indra/llui/lltextbox.cpp
+++ b/indra/llui/lltextbox.cpp
@@ -45,7 +45,9 @@ LLTextBox::LLTextBox(const LLTextBox::Params& p)
 :	LLTextBase(p),
 	mClickedCallback(NULL),
 	mShowCursorHand(true)
-{}
+{
+	mSkipTripleClick = true;
+}
 
 LLTextBox::~LLTextBox()
 {}
-- 
cgit v1.2.3