diff options
author | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:32:12 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:32:12 -0500 |
commit | b8a925ec71f2a4483476e363428c5656702b1f19 (patch) | |
tree | 117c4b884d8fd1e79e8f64184e62ea453d82a990 /indra/llui/llbutton.h | |
parent | 23031612745c7f1094a77252b24039333420b8c5 (diff) | |
parent | 90a365ed2f13612d267a4eed9b54bd1b62edb7d5 (diff) |
merge fix for STORM-584
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 */ |