summaryrefslogtreecommitdiff
path: root/indra/llui/llbutton.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-09-14 14:54:20 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-09-14 14:54:20 -0400
commit4b269f67ea8d053b4c05a9c002811901c8ec8a49 (patch)
tree401f44f1c339fc8fa847c355129d91cacd2bd22a /indra/llui/llbutton.cpp
parentdf40eca093b1a238daea9cd23c44f6e39719bf51 (diff)
parentb2d20f5a989bde2c4db90091bec37d310cc346fc (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));
}