diff options
| author | James Cook <james@lindenlab.com> | 2009-11-24 08:47:13 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-24 08:47:13 -0800 |
| commit | f9081220accfe5c197f1c567af8806bde236f946 (patch) | |
| tree | e711a74a34aa309222d28f694f02345dde305c4d /indra/llui/llmultisliderctrl.cpp | |
| parent | 76be5ddc7022508e7d3fcb04165b4a6f64f1d58d (diff) | |
| parent | 0b3f6b3e9a1414c11ccf6011930c2eec6cf2fdd7 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/llui/llmultisliderctrl.cpp')
| -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 a9f462173d..87938c19d4 100644 --- a/indra/llui/llmultisliderctrl.cpp +++ b/indra/llui/llmultisliderctrl.cpp @@ -344,7 +344,7 @@ void LLMultiSliderCtrl::onEditorCommit( LLUICtrl* ctrl, const LLSD& userdata) if( self->mMultiSlider->getMinValue() <= val && val <= self->mMultiSlider->getMaxValue() ) { self->setCurSliderValue( val ); // set the value temporarily so that the callback can retrieve it. - if( self->mValidateSignal( self, val ) ) + if( !self->mValidateSignal || (*(self->mValidateSignal))( self, val ) ) { success = TRUE; } @@ -378,7 +378,7 @@ void LLMultiSliderCtrl::onSliderCommit(LLUICtrl* ctrl, const LLSD& userdata) F32 new_val = self->mMultiSlider->getCurSliderValue(); self->mCurValue = new_val; // set the value temporarily so that the callback can retrieve it. - if( self->mValidateSignal( self, new_val ) ) + if( !self->mValidateSignal || (*(self->mValidateSignal))( self, new_val ) ) { success = TRUE; } |