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