diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-03 07:06:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-03 07:06:04 -0500 |
| commit | 67c01ab1fb1bfcb03c304946ccb2375f405187bf (patch) | |
| tree | ddb6bfd70f44aea70ccb33af4ec804319300f9a5 /indra/llui/llbutton.h | |
| parent | 039c0466f9759d7b966d8faf60945b3924d017a8 (diff) | |
| parent | b8a925ec71f2a4483476e363428c5656702b1f19 (diff) | |
merge up to new beta 1 candidate
Diffstat (limited to 'indra/llui/llbutton.h')
| -rw-r--r-- | indra/llui/llbutton.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h index 2d5fefa78c..16aa49b653 100644 --- a/indra/llui/llbutton.h +++ b/indra/llui/llbutton.h @@ -124,6 +124,8 @@ public: Optional<F32> hover_glow_amount; Optional<TimeIntervalParam> held_down_delay; + Optional<bool> use_draw_context_alpha; + Params(); }; @@ -338,6 +340,8 @@ private: S32 mImageOverlayTopPad; S32 mImageOverlayBottomPad; + bool mUseDrawContextAlpha; + /* * Space between image_overlay and label */ |