livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
meow-7.2.2
Yuri Chebotarev 2010-06-14 11:05:15 +03:00
parent 9a3432857d
commit 0904b13cbb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/lltextbase.cpp
View File

@ -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 );