Manual merge from default branch.

Resolved a conflict in indra/llui/llurlentry.cpp. That broke the fix for EXT-6357.

--HG--
branch : product-engine

1 files changed, 7 insertions, 0 deletions

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 56d7a63832..e08026eaf4 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1059,6 +1059,13 @@ void LLTextBase::setValue(const LLSD& value )
 }
 
 //virtual
+BOOL LLTextBase::canDeselect() const 
+{ 
+	return hasSelection(); 
+}
+
+
+//virtual
 void LLTextBase::deselect()
 {
 	mSelectionStart = 0;