diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-06 16:39:23 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-06 16:39:23 -0400 |
| commit | a41ca2c34d291b4eebdeeb4475b512f2a8af5cb1 (patch) | |
| tree | e305b00950eb562abec94ce33307b6694ca6ec98 /indra/newview/lljoystickbutton.h | |
| parent | fd91f09e19f937cb7e2f779c4e146064415ad427 (diff) | |
| parent | 5f38ec7f92fcea833352cd30797a9d73ef5a041f (diff) | |
merge fixes for storm-1602 up to latest viewer-development
Diffstat (limited to 'indra/newview/lljoystickbutton.h')
| -rw-r--r-- | indra/newview/lljoystickbutton.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lljoystickbutton.h b/indra/newview/lljoystickbutton.h index 93e2e7128b..8d76aa9531 100644 --- a/indra/newview/lljoystickbutton.h +++ b/indra/newview/lljoystickbutton.h @@ -57,7 +57,7 @@ public: Params() : quadrant("quadrant", JQ_ORIGIN) { - label = ""; + changeDefault(label, ""); } }; LLJoystick(const Params&); @@ -137,7 +137,7 @@ public: { Params() { - held_down_delay.seconds(0.0); + changeDefault(held_down_delay.seconds, 0.0); } }; |