summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerjoystick.cpp
diff options
context:
space:
mode:
authorBaker Linden <baker@lindenlab.com>2013-12-18 18:25:47 -0500
committerBaker Linden <baker@lindenlab.com>2013-12-18 18:25:47 -0500
commit3c521d8207092f1c48e158082b88c5e81cc9c440 (patch)
tree36a18cfaed8fc4e3ee2a84604f3876832522e529 /indra/newview/llviewerjoystick.cpp
parent74707f0057c05dc4dd439302e64fe29e8ed91a32 (diff)
parent1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff)
viewer-release merge
Diffstat (limited to 'indra/newview/llviewerjoystick.cpp')
-rwxr-xr-xindra/newview/llviewerjoystick.cpp2
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;
}
}