summaryrefslogtreecommitdiff
path: root/indra/llui/llbutton.cpp
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-10-16 08:32:26 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-10-16 08:32:26 -0400
commit4ac1b64665a49c7121411f3db27718f0c37eaf33 (patch)
tree85d7f3ccdacd6f322fb1fa213aa91c12b2d4abf4 /indra/llui/llbutton.cpp
parent972df2587863737eafde9caf6fce89f330358b5e (diff)
parent2f9edd050669210d651e66a86efb9746c3fa8a34 (diff)
merge
Diffstat (limited to 'indra/llui/llbutton.cpp')
-rw-r--r--indra/llui/llbutton.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 7b015bd576..2459429f6e 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -101,11 +101,11 @@ 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");
- held_down_delay.seconds = 0.5f;
- initial_value.set(LLSD(false), false);
+ changeDefault(initial_value, LLSD(false));
}