diff options
| author | simon <none@none> | 2013-05-29 14:42:19 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-05-29 14:42:19 -0700 |
| commit | 507ce0d84fc3e7717c7c9ae58dcdae7785936f65 (patch) | |
| tree | a7dde82693b2297a27024a00624c1ec9f81c2d0c /indra/llui | |
| parent | 473474b94969799d2835191072c5bca1b7d431d8 (diff) | |
| parent | 3698aece0d2b396b55b46189e8ea7ee02da9483b (diff) | |
Merge downstream code
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 b25f9b913c..df9ee4f4ca 100755 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -3205,14 +3205,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; } |