diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-02-11 11:44:21 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-02-11 11:44:21 -0800 |
| commit | c7715a74fd63c5dda370a5fe07089213a53014cb (patch) | |
| tree | f9fda627380aa5f20d028482fc1999e4d3232166 /indra/llui/llmultisliderctrl.cpp | |
| parent | 494a42a680cdaa90dce677fd66ff722ccf1401f3 (diff) | |
| parent | a97c4d3ad879b8e53696b9cab9c5ab7141c7fc6c (diff) | |
Merge with tip
Diffstat (limited to 'indra/llui/llmultisliderctrl.cpp')
| -rw-r--r-- | indra/llui/llmultisliderctrl.cpp | 4 |
1 files changed, 4 insertions, 0 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; |