diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
| commit | 07129bf928f79246849e66b396fab44a7a228216 (patch) | |
| tree | e4e19b342540450ff84dad75f90d5acb5b3d6269 /indra/newview/lloutputmonitorctrl.h | |
| parent | 03ebc43132331b9a8dcb3c418ec9c319a6beddda (diff) | |
| parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) | |
Merge recent changes
Diffstat (limited to 'indra/newview/lloutputmonitorctrl.h')
| -rw-r--r-- | indra/newview/lloutputmonitorctrl.h | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/indra/newview/lloutputmonitorctrl.h b/indra/newview/lloutputmonitorctrl.h index 881ad0f010..e391c14e40 100644 --- a/indra/newview/lloutputmonitorctrl.h +++ b/indra/newview/lloutputmonitorctrl.h @@ -50,14 +50,14 @@ public: struct Params : public LLInitParam::Block<Params, LLView::Params> { Optional<bool> draw_border; + Mandatory<LLUIImage*> image_mute, + image_off, + image_on, + image_level_1, + image_level_2, + image_level_3; - Params() - { - draw_border = true; - name = "output_monitor"; - follows.flags(FOLLOWS_LEFT|FOLLOWS_TOP); - mouse_opaque = false; - }; + Params(); }; protected: bool mBorder; @@ -77,16 +77,22 @@ public: void setIsMuted(bool val) { mIsMuted = val; } private: - static LLColor4 sColorMuted; - static LLColor4 sColorNormal; - static LLColor4 sColorOverdriven; + //static LLColor4 sColorMuted; + //static LLColor4 sColorNormal; + //static LLColor4 sColorOverdriven; static LLColor4 sColorBound; - static S32 sRectsNumber; - static F32 sRectWidthRatio; - static F32 sRectHeightRatio; + //static S32 sRectsNumber; + //static F32 sRectWidthRatio; + //static F32 sRectHeightRatio; F32 mPower; bool mIsMuted; + LLPointer<LLUIImage> mImageMute; + LLPointer<LLUIImage> mImageOff; + LLPointer<LLUIImage> mImageOn; + LLPointer<LLUIImage> mImageLevel1; + LLPointer<LLUIImage> mImageLevel2; + LLPointer<LLUIImage> mImageLevel3; }; #endif |