diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-06-15 14:57:16 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-06-15 14:57:16 +0100 |
| commit | 0b523e402720493cd19a2fa08f8cffceea01eadf (patch) | |
| tree | dc5137535761f87729932ed1de2ec33273b43b32 /indra/llui/lltextbase.cpp | |
| parent | d5ddb91a6809540cdb407cd48eff32b2c595d5db (diff) | |
| parent | fce2653f6b5e8ca3509d13e3449b1fdd2f5ff826 (diff) | |
Merge
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -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)) |