diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-09-12 14:52:18 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-09-12 14:52:18 -0400 |
| commit | e26bd6c140c24d72b44966127825fef5bbe47c1d (patch) | |
| tree | c70214a7a7e898b528f6b0f3ec6d47992969fe97 /indra/newview/lljoystickbutton.h | |
| parent | 08b75949998adbe3bbb4ef1d1d7e49405e468c94 (diff) | |
| parent | 1c57963673193d5a3da638848c0540a5fbc91603 (diff) | |
merge changes for storm-1593 (marketplace inbox)
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); } }; |