Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes, mainly for Clang/Mac, from Cinder.

Browse Source
This commit is contained in:
Inusaito Sayori
2014-03-24 16:56:10 -04:00
parent 924011f36e
commit 5affacab70
19 changed files with 80 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llagentcamera.cpp
View File

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