diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-03-14 23:21:38 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-03-14 23:21:38 +0000 |
| commit | 04611efae8a3291ceba8a29dd920bdae0d404830 (patch) | |
| tree | 43966566a1eeb42cf546a638310348f0585fc395 /indra/newview/lltoolgun.cpp | |
| parent | c0c5bdbbb90e0bcdab558ec22ea352c9d08dc078 (diff) | |
[NOTE: This was an erroneous commit, and was reverted in the next revision]
QAR-369 - viewer-cleanup2-7 81916 merged into release.
Diffstat (limited to 'indra/newview/lltoolgun.cpp')
| -rw-r--r-- | indra/newview/lltoolgun.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/indra/newview/lltoolgun.cpp b/indra/newview/lltoolgun.cpp index ffa921125a..9c8bb97343 100644 --- a/indra/newview/lltoolgun.cpp +++ b/indra/newview/lltoolgun.cpp @@ -80,14 +80,10 @@ BOOL LLToolGun::handleHover(S32 x, S32 y, MASK mask) { if( gAgent.cameraMouselook() ) { - #if 1 //LL_WINDOWS || LL_DARWIN - const F32 NOMINAL_MOUSE_SENSITIVITY = 0.0025f; - #else - const F32 NOMINAL_MOUSE_SENSITIVITY = 0.025f; - #endif + const F32 NOMINAL_MOUSE_SENSITIVITY = 0.0025f; - - F32 mouse_sensitivity = clamp_rescale(gMouseSensitivity, 0.f, 15.f, 0.5f, 2.75f) * NOMINAL_MOUSE_SENSITIVITY; + F32 mouse_sensitivity = gSavedSettings.getF32("MouseSensitivity"); + mouse_sensitivity = clamp_rescale(mouse_sensitivity, 0.f, 15.f, 0.5f, 2.75f) * NOMINAL_MOUSE_SENSITIVITY; // ...move the view with the mouse @@ -98,7 +94,7 @@ BOOL LLToolGun::handleHover(S32 x, S32 y, MASK mask) if (dx != 0 || dy != 0) { // ...actually moved off center - if (gInvertMouse) + if (gSavedSettings.getBOOL("InvertMouse")) { gAgent.pitch(mouse_sensitivity * -dy); } |