diff options
author | Richard Nelson <richard@lindenlab.com> | 2011-10-10 17:53:09 -0700 |
---|---|---|
committer | Richard Nelson <richard@lindenlab.com> | 2011-10-10 17:53:09 -0700 |
commit | 7e13856df2c60a7e011df01459a3a085a3a4a82a (patch) | |
tree | 7fc6703b611628359cfec9a7a3107e05946dc94b /indra/llui/lltoolbar.cpp | |
parent | 6ad54f22f6ba0fe9f63823d57fd7c15d34e183aa (diff) | |
parent | 6a570a9bdc2660e4db87e8e7a65b724e1ad8d1b2 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/llui/lltoolbar.cpp')
-rw-r--r-- | indra/llui/lltoolbar.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp index 6332b2674a..5ba54edf1c 100644 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -852,3 +852,8 @@ void LLToolBarButton::onMouseCaptureLost() { mIsDragged = false; } + +void LLToolBarButton::reshape(S32 width, S32 height, BOOL called_from_parent) +{ + LLButton::reshape(mWidthRange.clamp(width), height, called_from_parent); +} |