diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-06-14 11:05:15 +0300 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-06-14 11:05:15 +0300 |
| commit | 0904b13cbb2b50a77a1ee34d40a7f5d76df148d3 (patch) | |
| tree | becbe38e012db8d1e964b8586e3f8f674b597117 /indra/llui/lltextbase.cpp | |
| parent | 9a3432857d790a003a12fd9ebb7b2ab6f9dcc347 (diff) | |
EXT-7726 FIX didn't increase width if image segment didn't fit current line
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/557/
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 72f3a14822..1a4b804ce4 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -2791,7 +2791,7 @@ bool LLImageTextSegment::getDimensions(S32 first_char, S32 num_chars, S32& width height = llceil(mStyle->getFont()->getLineHeight());; LLUIImagePtr image = mStyle->getImage(); - if( image.notNull()) + if( num_chars>0 && image.notNull()) { width += image->getWidth() + IMAGE_HPAD; height = llmax(height, image->getHeight() + IMAGE_HPAD ); |