Add option to disable scroll offset changing modifier

This commit is contained in:
Drake Arconis
2013-11-12 23:47:28 -05:00
parent 6b5875c008
commit e5fcd54c92
2 changed files with 13 additions and 2 deletions

View File

@@ -2075,7 +2075,8 @@ void LLAgentCamera::handleScrollWheel(S32 clicks)
{
if (MASK mask = gKeyboard->currentMask(true)) // Singu Note: Conveniently set view offsets while modifier keys are held during scroll
{
if (mask & MASK_CONTROL|MASK_SHIFT)
static const LLCachedControl<bool> enableCameraOffsetScroll("SinguOffsetScrollKeys");
if (mask & MASK_CONTROL|MASK_SHIFT && enableCameraOffsetScroll)
{
const F32 change(static_cast<F32>(clicks) * 0.1f);
if (mask & MASK_SHIFT)