From b183b6f1413f2f534633f021480ccc4570235f2d Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 6 Sep 2011 14:45:11 -0700 Subject: EXP-1196 FIX Fix param block template ordering changed ordering of template loading relative to constructor setting of params moved a lot of constructor-set params to template files reviewed by Leslie --- indra/llui/llbutton.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/llui/llbutton.cpp') diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index 7b015bd576..a12235c16f 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -104,8 +104,7 @@ LLButton::Params::Params() handle_right_mouse("handle_right_mouse") { addSynonym(is_toggle, "toggle"); - held_down_delay.seconds = 0.5f; - initial_value.set(LLSD(false), false); + changeDefault(initial_value, LLSD(false)); } -- cgit v1.2.3 From 24db50a37f9721e42824685faed3a72e7383d7d1 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 8 Sep 2011 15:07:11 -0700 Subject: fix for held down delay not parsing from xui --- indra/llui/llbutton.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/llui/llbutton.cpp') 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)); -- cgit v1.2.3