summaryrefslogtreecommitdiff
path: root/indra/llui/llbutton.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-02 15:26:19 -0500
committerOz Linden <oz@lindenlab.com>2010-12-02 15:26:19 -0500
commitcc65a9dbe2a8570b3f392aacfb3a6ee1d76ee2be (patch)
tree9736a496da97c9a190da076f7311280d9864d638 /indra/llui/llbutton.h
parentc51608633ddfdcf9a053fff37461059398ed4500 (diff)
parente1d31a5aca0e1619769735e6902b012bad965805 (diff)
merge up to latest beta
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
*/