diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-10 16:06:01 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-10 16:06:01 +0200 |
| commit | 6f5b47a4e7128d8e7b2f8a46c498a971ad39900e (patch) | |
| tree | 181b43d1a870bff0863e3f7c0a4a752993cc9d4e /indra/newview/llfloatercolorpicker.h | |
| parent | 4df594defc4ad7f21139d99fb95197a0aa78854b (diff) | |
| parent | 562d343c47570731664b34507359c823cfcbd634 (diff) | |
Merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfloatercolorpicker.h')
| -rw-r--r-- | indra/newview/llfloatercolorpicker.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloatercolorpicker.h b/indra/newview/llfloatercolorpicker.h index a16cde7f10..b381740acd 100644 --- a/indra/newview/llfloatercolorpicker.h +++ b/indra/newview/llfloatercolorpicker.h @@ -56,6 +56,7 @@ class LLFloaterColorPicker // overrides virtual BOOL postBuild (); + virtual void onClose(bool app_settings); virtual void draw (); virtual BOOL handleMouseDown ( S32 x, S32 y, MASK mask ); virtual BOOL handleMouseUp ( S32 x, S32 y, MASK mask ); @@ -69,6 +70,7 @@ class LLFloaterColorPicker void destroyUI (); void cancelSelection (); LLColorSwatchCtrl* getSwatch () { return mSwatch; }; + void setSwatch( LLColorSwatchCtrl* swatch) { mSwatch = swatch; } // mutator / accessor for original RGB value void setOrigRgb ( F32 origRIn, F32 origGIn, F32 origBIn ); |