summaryrefslogtreecommitdiff
path: root/indra/llui/llbutton.cpp
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2011-09-19 14:50:08 -0400
committerLogan Dethrow <log@lindenlab.com>2011-09-19 14:50:08 -0400
commit5b7b3cbbbbec439880a33af8944d10c7bb527c3a (patch)
tree3e37afeba3e2bb67f53327719de72b4506d2605e /indra/llui/llbutton.cpp
parentc7dd3aac83eb9bde5fe0febaebcd998847bf1889 (diff)
parent2fba01d160716b886a7dfc0c86abda767a25d23f (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));
}