diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-12-07 14:56:36 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-12-07 14:56:36 -0500 |
| commit | 6a59861bde42e1b8ddc8c19a0b37a2b0a7011f7a (patch) | |
| tree | 7a6d04e723a71c33205cdfa9815006d45310657c /indra/llui/lliconctrl.h | |
| parent | 6a0c02c1b1e6ea3d84f06f2ab58402a98eece462 (diff) | |
| parent | d9b4570883652d647c05083c18fac1a088efd6e2 (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/llui/lliconctrl.h')
| -rw-r--r-- | indra/llui/lliconctrl.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/lliconctrl.h b/indra/llui/lliconctrl.h index 79a8b0fb28..e9bdab2d47 100644 --- a/indra/llui/lliconctrl.h +++ b/indra/llui/lliconctrl.h @@ -48,6 +48,7 @@ public: { Optional<LLUIImage*> image; Optional<LLUIColor> color; + Optional<bool> use_draw_context_alpha; Ignored scale_image; Params(); }; @@ -79,6 +80,10 @@ protected: S32 mDrawWidth ; S32 mDrawHeight ; + // If set to true (default), use the draw context transparency. + // If false, will use transparency returned by getCurrentTransparency(). See STORM-698. + bool mUseDrawContextAlpha; + private: LLUIColor mColor; LLPointer<LLUIImage> mImagep; |