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/llfloatercolorpicker.h | |
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/llfloatercolorpicker.h')
-rwxr-xr-x | indra/newview/llfloatercolorpicker.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llfloatercolorpicker.h b/indra/newview/llfloatercolorpicker.h index 8c16ebdf03..16974a872e 100755 --- a/indra/newview/llfloatercolorpicker.h +++ b/indra/newview/llfloatercolorpicker.h @@ -104,6 +104,11 @@ class LLFloaterColorPicker void setMouseDownInSwatch (BOOL mouse_down_in_swatch); BOOL getMouseDownInSwatch () { return mMouseDownInSwatch; } + void setRevertOnCancel (BOOL revertOnCancel) { mRevertOnCancel = revertOnCancel; }; + BOOL getRevertOnCancel () { return mRevertOnCancel; } + + BOOL isColorChanged (); + // called when text entries (RGB/HSL etc.) are changed by user void onTextEntryChanged ( LLUICtrl* ctrl ); @@ -144,6 +149,8 @@ class LLFloaterColorPicker BOOL mMouseDownInHueRegion; BOOL mMouseDownInSwatch; + BOOL mRevertOnCancel; + const S32 mRGBViewerImageLeft; const S32 mRGBViewerImageTop; const S32 mRGBViewerImageWidth; |