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

Introducing SGIgnoreSimulatorCameraConstraints

Browse Source
This commit is contained in:
Siana Gearz
2012-11-13 23:46:21 +01:00
parent 3d84157325
commit 8c9a9c9d12
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,17 @@
<string>settings_rlv.xml</string>
</array>
<key>SGIgnoreSimulatorCameraConstraints</key>
<map>
<key>Comment</key>
<string>Don't let the simulator push your camera around</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>SGAllowRiggedMeshSelection</key>
<map>
<key>Comment</key>

5
indra/newview/llagentcamera.cpp
View File

@@ -1844,7 +1844,10 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit)
local_camera_offset = gAgent.getFrameAgent().rotateToAbsolute( local_camera_offset );
}
if (!mCameraCollidePlane.isExactlyZero() && (!isAgentAvatarValid() || !gAgentAvatarp->isSitting()))
if ( !mCameraCollidePlane.isExactlyZero()
&& !gSavedSettings.getBOOL("SGIgnoreSimulatorCameraConstraints")
&& isAgentAvatarValid()
&& !gAgentAvatarp->isSitting())
{
LLVector3 plane_normal;
plane_normal.setVec(mCameraCollidePlane.mV);