diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-06-15 13:26:09 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-06-15 13:26:09 +0300 |
| commit | cfb9a6e3411b52d5916ea809c66d8412d90bfe4d (patch) | |
| tree | 3b6dbed2d7cb917b5cf8d5d79914f9553400d268 /indra/llui/lltextbase.cpp | |
| parent | 11903fab735d3eb3464bdec5cf11a1027fd2ac3f (diff) | |
| parent | a43c997d0a7209da7e1b3d42b3e3998498741764 (diff) | |
Merge from default branch
--HG--
branch : product-engine
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)) |