diff options
| author | Richard Nelson <none@none> | 2010-06-14 15:37:39 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-06-14 15:37:39 -0700 |
| commit | 380f472308e3be7af3b3efb57098cc30aee2c901 (patch) | |
| tree | 56ed057efed014a384e04bd34bf19cab0213ff44 | |
| parent | e96544ff266849207adfc3823adfc2dcfe42ce72 (diff) | |
EXT-7833 FIX [crashhunters] Crash in LLTextBase::reflow()
| -rw-r--r-- | indra/llui/lltextbase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 1a4b804ce4..3c6c7d3e82 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -2803,13 +2803,13 @@ S32 LLImageTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 lin { LLUIImagePtr image = mStyle->getImage(); S32 image_width = image->getWidth(); - if(num_pixels>image_width + IMAGE_HPAD) + if(line_offset == 0 || num_pixels>image_width + IMAGE_HPAD) { return 1; } - return 0; } + F32 LLImageTextSegment::draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect) { if ( (start >= 0) && (end <= mEnd - mStart)) |