diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-03-22 16:19:10 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-03-22 16:19:10 -0400 |
| commit | 0879c48d832a69050e6fc6ac67b0d5f95b52e054 (patch) | |
| tree | c872ae80e13d12c3a282fd2af2c5005b0edb5e95 /indra/newview/llcolorswatch.cpp | |
| parent | cbbe82b8dc08260aa4102214a7c99aeab7915371 (diff) | |
| parent | 2afde26d93cc8773f5e84d187844f909347fc1bf (diff) | |
merge
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()); |