diff options
| author | James Cook <james@lindenlab.com> | 2009-12-18 12:32:01 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-18 12:32:01 -0800 |
| commit | efdfc74b21f5d6386cc03136c4d2a8dcf07f9958 (patch) | |
| tree | 620d86df1d2b2cc409109eace7888cb68e1dc921 /indra/llui | |
| parent | eb501f3231aacb2fd97d8428bb2d25b818b26263 (diff) | |
| parent | c1b58587dfe4711383b1878d341527221d2c298f (diff) | |
Merge with viewer-2-0 again, to pick up avatar changes
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llmultisliderctrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llmultisliderctrl.cpp b/indra/llui/llmultisliderctrl.cpp index 87938c19d4..7323323d8c 100644 --- a/indra/llui/llmultisliderctrl.cpp +++ b/indra/llui/llmultisliderctrl.cpp @@ -328,7 +328,7 @@ void LLMultiSliderCtrl::updateText() // static void LLMultiSliderCtrl::onEditorCommit( LLUICtrl* ctrl, const LLSD& userdata) { - LLMultiSliderCtrl* self = dynamic_cast<LLMultiSliderCtrl*>(ctrl); + LLMultiSliderCtrl* self = dynamic_cast<LLMultiSliderCtrl*>(ctrl->getParent()); if (!ctrl) return; @@ -369,7 +369,7 @@ void LLMultiSliderCtrl::onEditorCommit( LLUICtrl* ctrl, const LLSD& userdata) // static void LLMultiSliderCtrl::onSliderCommit(LLUICtrl* ctrl, const LLSD& userdata) { - LLMultiSliderCtrl* self = dynamic_cast<LLMultiSliderCtrl*>(ctrl); + LLMultiSliderCtrl* self = dynamic_cast<LLMultiSliderCtrl*>(ctrl->getParent()); if (!self) return; |