diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-12-23 15:18:18 +0200 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-12-23 15:18:18 +0200 |
| commit | 6901fea2033663e16f7fe7ad2afcf0ba4654eef8 (patch) | |
| tree | 6a9e8355133467985b08af1a140b6074c5ab90ee /indra/newview/llcolorswatch.cpp | |
| parent | 68e41999d5f6e0ca5e48d16f0198af949c01dbce (diff) | |
MAINT-1401 FIXED Pressing 'Cancel' button in 'Color picker' dialog changes color of prim to the previous
Diffstat (limited to 'indra/newview/llcolorswatch.cpp')
| -rwxr-xr-x | indra/newview/llcolorswatch.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llcolorswatch.cpp b/indra/newview/llcolorswatch.cpp index a03178adf6..80d810d159 100755 --- a/indra/newview/llcolorswatch.cpp +++ b/indra/newview/llcolorswatch.cpp @@ -292,7 +292,7 @@ void LLColorSwatchCtrl::onColorChanged ( void* data, EColorPickOp pick_op ) subject->mColor.mV[VALPHA] ); // keep current alpha subject->mColor = updatedColor; subject->setControlValue(updatedColor.getValue()); - + pickerp->setRevertOnCancel(TRUE); if (pick_op == COLOR_CANCEL && subject->mOnCancelCallback) { subject->mOnCancelCallback( subject, LLSD()); |