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

Merge remote-tracking branch 'lightdrake/master'

Browse Source
This commit is contained in:
Latif Khalifa
2013-11-13 12:51:31 +01:00
parent 29a07f4b5c e5fcd54c92
commit a3b232f389
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/app_settings/settings.xml
View File

@@ -8,7 +8,17 @@
<string>settings_sh.xml</string>
<string>settings_rlv.xml</string>
</array>
<key>SinguOffsetScrollKeys</key>
<map>
<key>Comment</key>
<string>Enable keys to modify camera and focus offsets</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>PhoenixIMAnnounceStealFocus</key>
<map>
<key>Comment</key>

3
indra/newview/llagentcamera.cpp
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)