diff options
| author | Graham Madarasz (Graham) <graham@lindenlab.com> | 2013-05-22 10:27:00 -0700 |
|---|---|---|
| committer | Graham Madarasz (Graham) <graham@lindenlab.com> | 2013-05-22 10:27:00 -0700 |
| commit | 46c3c7f7a5118ea3b77cdc24676bd223d0e3c1d7 (patch) | |
| tree | 6250a6dfcc6df071940c45a3d1a220d6bbdfe1c6 /indra/llui | |
| parent | 69ad1f62363f228c397fe5a8a327436f73898876 (diff) | |
| parent | 2b517892ad571d935645f46eee5b0c1182d9c5c9 (diff) | |
Merge
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; } |