diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-24 22:11:24 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-24 22:11:24 -0500 |
| commit | ccf6cb3f9ba387117720d700b73ac8e05dbf1f75 (patch) | |
| tree | 71163fde19389893c8951ebb723ddf9379318518 /indra/llui/llmultisliderctrl.cpp | |
| parent | 2369fa96c24bafbd032c85b58767502cfd37ebaf (diff) | |
| parent | 5b5354c933aa7b1ceeb307853c24fba28d4e31bf (diff) | |
viewer-2.0 automated merge
--HG--
branch : avatar-pipeline
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; } |