From 672a76d0ea08a0d0fc824e103ee4c4242b7e03ec Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Sat, 15 Mar 2008 01:18:27 +0000 Subject: reverting premature commit at 82410. --- indra/newview/lltoolgun.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'indra/newview/lltoolgun.cpp') diff --git a/indra/newview/lltoolgun.cpp b/indra/newview/lltoolgun.cpp index 9c8bb97343..ffa921125a 100644 --- a/indra/newview/lltoolgun.cpp +++ b/indra/newview/lltoolgun.cpp @@ -80,10 +80,14 @@ BOOL LLToolGun::handleHover(S32 x, S32 y, MASK mask) { if( gAgent.cameraMouselook() ) { - const F32 NOMINAL_MOUSE_SENSITIVITY = 0.0025f; + #if 1 //LL_WINDOWS || LL_DARWIN + const F32 NOMINAL_MOUSE_SENSITIVITY = 0.0025f; + #else + const F32 NOMINAL_MOUSE_SENSITIVITY = 0.025f; + #endif - F32 mouse_sensitivity = gSavedSettings.getF32("MouseSensitivity"); - mouse_sensitivity = clamp_rescale(mouse_sensitivity, 0.f, 15.f, 0.5f, 2.75f) * NOMINAL_MOUSE_SENSITIVITY; + + F32 mouse_sensitivity = clamp_rescale(gMouseSensitivity, 0.f, 15.f, 0.5f, 2.75f) * NOMINAL_MOUSE_SENSITIVITY; // ...move the view with the mouse @@ -94,7 +98,7 @@ BOOL LLToolGun::handleHover(S32 x, S32 y, MASK mask) if (dx != 0 || dy != 0) { // ...actually moved off center - if (gSavedSettings.getBOOL("InvertMouse")) + if (gInvertMouse) { gAgent.pitch(mouse_sensitivity * -dy); } -- cgit v1.3