diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-11 15:07:37 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-11 15:07:37 +0000 |
| commit | 15ff4379e53eb5b3ed914c46c0051c3926de1ecb (patch) | |
| tree | f16087fcddedb2a4e19f1f24b24de9e3c257d5b0 /indra/llui | |
| parent | 19962a783365784e3b820521e5854fdaf217133c (diff) | |
| parent | f023d238292332b6ed72d95af5e7381ce1f55fc4 (diff) | |
merge from viewer2 trunk.
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llmultisliderctrl.cpp | 4 | ||||
| -rw-r--r-- | indra/llui/lltabcontainer.cpp | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/indra/llui/llmultisliderctrl.cpp b/indra/llui/llmultisliderctrl.cpp index cb81c39103..50942e55ca 100644 --- a/indra/llui/llmultisliderctrl.cpp +++ b/indra/llui/llmultisliderctrl.cpp @@ -331,6 +331,10 @@ void LLMultiSliderCtrl::updateText() void LLMultiSliderCtrl::onEditorCommit( LLUICtrl* ctrl, const LLSD& userdata) { LLMultiSliderCtrl* self = dynamic_cast<LLMultiSliderCtrl*>(ctrl->getParent()); + llassert(self); + if (!self) // cast failed - wrong type! :O + return; + if (!ctrl) return; diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index 33147f30c9..575b6e3b6c 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -1631,14 +1631,9 @@ void LLTabContainer::setTabImage(LLPanel* child, LLIconCtrl* icon) void LLTabContainer::reshapeTuple(LLTabTuple* tuple) { static LLUICachedControl<S32> tab_padding ("UITabPadding", 0); - static LLUICachedControl<S32> image_top_padding ("UIButtonImageTopPadding", 2); - static LLUICachedControl<S32> image_bottom_padding ("UIButtonImageBottomPadding", 2); if (!mIsVertical) { - tuple->mButton->setImageOverlayTopPad(image_top_padding); - tuple->mButton->setImageOverlayBottomPad(image_bottom_padding); - // remove current width from total tab strip width mTotalTabWidth -= tuple->mButton->getRect().getWidth(); |