diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-07-09 18:02:19 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-07-09 18:02:19 -0700 |
| commit | 550c6e369474a68bf43af039cd522165eaac1512 (patch) | |
| tree | f5e21f7861a1e5599a59acec5ee12fc12d12c4a4 /indra/llui | |
| parent | 1d41ff232870428022006875e98df5be21731c68 (diff) | |
| parent | 9ab042dd1d003da15dd579f366db04d4aae3ff6b (diff) | |
Pull from richard/viewer-chui
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 6 |
1 files 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(); } // |