summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-09-08 15:14:08 -0700
committerLeslie Linden <leslie@lindenlab.com>2011-09-08 15:14:08 -0700
commit0a4bce2b79091ee5b8f4c309a62a86538a2bce72 (patch)
treeaca2c7b9e25d8eb9e3adbf2caf93f4f843b0db4f
parent8b1ce96eaefc7d977a084e421834330a57f26b37 (diff)
parent24db50a37f9721e42824685faed3a72e7383d7d1 (diff)
Merge
-rw-r--r--indra/llui/llbutton.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index a12235c16f..2459429f6e 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -101,7 +101,8 @@ LLButton::Params::Params()
commit_on_return("commit_on_return", true),
use_draw_context_alpha("use_draw_context_alpha", true),
badge("badge"),
- handle_right_mouse("handle_right_mouse")
+ handle_right_mouse("handle_right_mouse"),
+ held_down_delay("held_down_delay")
{
addSynonym(is_toggle, "toggle");
changeDefault(initial_value, LLSD(false));