diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-21 14:14:42 +0300 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-21 14:14:42 +0300 |
commit | 4a999fe04414f5489c555dbd609e7bae1c2667d6 (patch) | |
tree | c93505b07bbd7ca68ed7239655c42e7316b17ecd /indra/llui/llcheckboxctrl.cpp | |
parent | 52abfbbc4a3fbf55379fab861a1312eb5cecbc4d (diff) | |
parent | 842e5111ae2d0a83755ff902afa43dc84e45662b (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/llcheckboxctrl.cpp')
-rw-r--r-- | indra/llui/llcheckboxctrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llcheckboxctrl.cpp b/indra/llui/llcheckboxctrl.cpp index 3d32157406..6f81f5434c 100644 --- a/indra/llui/llcheckboxctrl.cpp +++ b/indra/llui/llcheckboxctrl.cpp @@ -191,7 +191,7 @@ void LLCheckBoxCtrl::reshape(S32 width, S32 height, BOOL called_from_parent) static LLUICachedControl<S32> llcheckboxctrl_btn_size ("UICheckboxctrlBtnSize", 0); const S32 FUDGE = 10; - S32 text_width = mFont->getWidth( mLabel->getText() ) + FUDGE; + S32 text_width = mLabel->getTextBoundingRect().getWidth() + FUDGE; S32 text_height = llround(mFont->getLineHeight()); LLRect label_rect; label_rect.setOriginAndSize( |