diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-15 16:09:17 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-15 16:09:17 -0400 |
| commit | 92fa144dcea4cbb6426b895cf5359da0c90eb4ae (patch) | |
| tree | fc9f7dd3f875be8d50cc13050664b1f43ed0a93f /indra/newview/lljoystickbutton.h | |
| parent | 758b936deaa0e6ea397c49afa5024315415eeb93 (diff) | |
| parent | b2d20f5a989bde2c4db90091bec37d310cc346fc (diff) | |
merge
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); } }; |