diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-02-13 19:05:21 -0500 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-02-13 19:05:21 -0500 |
| commit | 0b579ba112e5e4fa5b5348f1c865a3083b5e1175 (patch) | |
| tree | 599c506927d50f9a4a51c2f776e8fe954505e4d0 /indra/llui/llmultisliderctrl.cpp | |
| parent | 96f29d2ba0b66754b3b7b9e0f75deb198a84cb5f (diff) | |
| parent | 9fee359d1baf6e0046655cb8e4afabb8774754b1 (diff) | |
Automated merge from viewer-2-0 to normalize beta 3
Diffstat (limited to 'indra/llui/llmultisliderctrl.cpp')
| -rw-r--r-- | indra/llui/llmultisliderctrl.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llui/llmultisliderctrl.cpp b/indra/llui/llmultisliderctrl.cpp index 50942e55ca..cc26c00a3e 100644 --- a/indra/llui/llmultisliderctrl.cpp +++ b/indra/llui/llmultisliderctrl.cpp @@ -330,13 +330,14 @@ void LLMultiSliderCtrl::updateText() // static void LLMultiSliderCtrl::onEditorCommit( LLUICtrl* ctrl, const LLSD& userdata) { + llassert(ctrl); + if (!ctrl) + return; + LLMultiSliderCtrl* self = dynamic_cast<LLMultiSliderCtrl*>(ctrl->getParent()); llassert(self); if (!self) // cast failed - wrong type! :O return; - - if (!ctrl) - return; BOOL success = FALSE; F32 val = self->mCurValue; |