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

Request: Add setting SinguMotionResetsCameraReset to let the user decide if SinguMotionResetsCamera will Reset without their explicit action.

Browse Source
This commit is contained in:
Lirusaito
2018-08-27 12:33:02 -04:00
parent 8ecbf79199
commit 13e2af8990
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -873,6 +873,18 @@
<key>Value</key>
<boolean>1</boolean>
</map>
<key>SinguMotionResetsCameraReset</key>
<map>
<key>Comment</key>
<string>Disable for the behavior Liru intended SinguMotionResetsCamera to have, wherein it doesn't reset every time you press escape, teleport, or whatever else! So you can walk around and your camera won't reset at all like it was meant to be.
RIP Latif Khalifa.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<boolean>1</boolean>
</map>
<key>SinguLastKnownReleaseBuild</key>
<map>
<key>Comment</key>

3
indra/newview/llviewermenu.cpp
View File

@@ -4088,7 +4088,8 @@ void reset_view_final( BOOL proceed )
}
gAgentCamera.resetView(TRUE, TRUE);
gAgentCamera.setLookAt(LOOKAT_TARGET_CLEAR);
gSavedSettings.setBOOL("SinguMotionResetsCamera", true);
if (gSavedSettings.getBOOL("SinguMotionResetsCameraReset"))
gSavedSettings.setBOOL("SinguMotionResetsCamera", true);
if(gAgentCamera.cameraCustomizeAvatar() && LLFloaterCustomize::instanceExists())
LLFloaterCustomize::getInstance()->close();