From 9ab042dd1d003da15dd579f366db04d4aae3ff6b Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Fri, 6 Jul 2012 17:49:02 +0300
Subject: CHUI-196 FIXED (Chat text entry area gets resized unexpectedly with
 certain user display names)

- Fixed label length calculating
---
 indra/llui/lltextbase.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 3b3bc64c5b..a7bc6bbb77 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -510,7 +510,7 @@ void LLTextBase::drawText()
 	}
 	else if (text_len <= 0 && !mLabel.empty() && !hasFocus())
 	{
-		text_len = mLabel.length();
+		text_len = mLabel.getWString().length();
 	}
 
 	S32 selection_left = -1;
@@ -1816,7 +1816,7 @@ void LLTextBase::resetLabel()
 		style->setColor(mTentativeFgColor);
 		LLStyleConstSP sp(style);
 
-		LLTextSegmentPtr label = new LLLabelTextSegment(sp, 0, getLabel().length() + 1, *this);
+		LLTextSegmentPtr label = new LLLabelTextSegment(sp, 0, mLabel.getWString().length() + 1, *this);
 		insertSegment(label);
 	}
 }
@@ -2988,7 +2988,7 @@ const LLWString& LLLabelTextSegment::getWText()	const
 /*virtual*/
 const S32 LLLabelTextSegment::getLength() const
 {
-	return mEditor.getLabel().length();
+	return mEditor.getWlabel().length();
 }
 
 //
-- 
cgit v1.2.3