summaryrefslogtreecommitdiff
path: root/indra/llui/llbutton.h
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-12-07 14:56:36 -0500
committerLoren Shih <seraph@lindenlab.com>2010-12-07 14:56:36 -0500
commit6a59861bde42e1b8ddc8c19a0b37a2b0a7011f7a (patch)
tree7a6d04e723a71c33205cdfa9815006d45310657c /indra/llui/llbutton.h
parent6a0c02c1b1e6ea3d84f06f2ab58402a98eece462 (diff)
parentd9b4570883652d647c05083c18fac1a088efd6e2 (diff)
Automated merge up from viewer-development
Diffstat (limited to 'indra/llui/llbutton.h')
-rw-r--r--indra/llui/llbutton.h4
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
*/