diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-11-11 19:43:29 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-11-11 19:43:29 +0200 |
| commit | 679a0d752193c757b70e39ad4408fa8492ad47f9 (patch) | |
| tree | c76a878d71927c6433d3ec8a3cecbfb4d6d1826b /indra/newview/llfloatercolorpicker.h | |
| parent | 56105df3999cee7a86c4338d105358875967225a (diff) | |
Backed out changeset: 19f3fa6e3e63
Diffstat (limited to 'indra/newview/llfloatercolorpicker.h')
| -rw-r--r-- | indra/newview/llfloatercolorpicker.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llfloatercolorpicker.h b/indra/newview/llfloatercolorpicker.h index 74b99d5e68..16974a872e 100644 --- a/indra/newview/llfloatercolorpicker.h +++ b/indra/newview/llfloatercolorpicker.h @@ -30,7 +30,6 @@ #include <vector> #include "llfloater.h" -#include "lldrawfrustum.h" #include "llpointer.h" #include "llcolorswatch.h" #include "llspinctrl.h" @@ -42,7 +41,7 @@ class LLCheckBoxCtrl; ////////////////////////////////////////////////////////////////////////////// // floater class class LLFloaterColorPicker - : public LLFloater, public LLDrawFrustum + : public LLFloater { public: LLFloaterColorPicker (LLColorSwatchCtrl* swatch, BOOL show_apply_immediate = FALSE); @@ -64,7 +63,7 @@ class LLFloaterColorPicker void destroyUI (); void cancelSelection (); LLColorSwatchCtrl* getSwatch () { return mSwatch; }; - void setSwatch(LLColorSwatchCtrl* swatch) { mSwatch = swatch; setFrustumOrigin(mSwatch); } + void setSwatch( LLColorSwatchCtrl* swatch) { mSwatch = swatch; } // mutator / accessor for original RGB value void setOrigRgb ( F32 origRIn, F32 origGIn, F32 origBIn ); @@ -197,6 +196,12 @@ class LLFloaterColorPicker LLButton* mCancelBtn; LLButton* mPipetteBtn; + + F32 mContextConeOpacity; + F32 mContextConeInAlpha; + F32 mContextConeOutAlpha; + F32 mContextConeFadeTime; + }; #endif // LL_LLFLOATERCOLORPICKER_H |