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

Automated merge with ssh://hg.lindenlab.com/dessie/viewer-release

meow-7.2.2
Richard Nelson 2010-06-14 15:39:10 -07:00
parent 5f64084313 7df20f1315
commit e9a6d24fc1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llfloater.cpp
View File

@ -347,7 +347,7 @@ void LLFloater::layoutDragHandle()
{
rect = getLocalRect();
}
mDragHandle->setRect(rect);
mDragHandle->setShape(rect);
updateTitleButtons();
}

4
indra/llui/lltextbase.cpp
View File

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