diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-11-11 16:19:35 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-11-11 16:19:35 -0500 |
| commit | 3c2b90514d1390594149f35a88f2e5d27d173d58 (patch) | |
| tree | 844fbaf5f5c285876601e098c2e109c35d542f07 /indra/newview/llviewerjoystick.cpp | |
| parent | b8f1e2a7704bdac5ef270be21918317a17f77b2a (diff) | |
| parent | ebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff) | |
merge 3.6.10-release
Diffstat (limited to 'indra/newview/llviewerjoystick.cpp')
| -rwxr-xr-x | indra/newview/llviewerjoystick.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerjoystick.cpp b/indra/newview/llviewerjoystick.cpp index f6e840adcd..aeeb591d55 100755 --- a/indra/newview/llviewerjoystick.cpp +++ b/indra/newview/llviewerjoystick.cpp @@ -919,7 +919,7 @@ void LLViewerJoystick::moveFlycam(bool reset) { if (i == X_I || i == Y_I || i == Z_I) { - static LLCachedControl<F32> build_mode_scale(gSavedSettings,"FlycamBuildModeScale"); + static LLCachedControl<F32> build_mode_scale(gSavedSettings,"FlycamBuildModeScale", 1.0); cur_delta[i] *= build_mode_scale; } } |