diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-05-29 11:44:22 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-05-29 11:44:22 -0700 |
| commit | ebc604fa8d12fb08fda1ac55aae817ad0135bb6b (patch) | |
| tree | 2487b5bd256188a0c49a1d46265d75f3190dd53c /indra/llui | |
| parent | 85dde8d591aabe03b01720a22f91e54fc3d04552 (diff) | |
| parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) | |
Merge with 3.5.4 release
Diffstat (limited to 'indra/llui')
| -rwxr-xr-x | 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 e70992129a..a45c4ced2e 100755 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -3206,14 +3206,14 @@ S32 LLNormalTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 lin LLWString offsetString(text.c_str() + segment_offset + mStart); if(getLength() < segment_offset + mStart) - { - llerrs << "getLength() < segment_offset + mStart\t getLength()\t" << getLength() << "\tsegment_offset:\t" + { + llinfos << "getLength() < segment_offset + mStart\t getLength()\t" << getLength() << "\tsegment_offset:\t" << segment_offset << "\tmStart:\t" << mStart << "\tsegments\t" << mEditor.mSegments.size() << "\tmax_chars\t" << max_chars << llendl; } if(offsetString.length() + 1 < max_chars) { - llerrs << "offsetString.length() + 1 < max_chars\t max_chars:\t" << max_chars << "\toffsetString.length():\t" << offsetString.length() + llinfos << "offsetString.length() + 1 < max_chars\t max_chars:\t" << max_chars << "\toffsetString.length():\t" << offsetString.length() << " getLength() : " << getLength() << "\tsegment_offset:\t" << segment_offset << "\tmStart:\t" << mStart << "\tsegments\t" << mEditor.mSegments.size() << llendl; } |