Trivial changes. Resolved some sign mismatch warnings, and now using LLCachedControl for 'SGIgnoreSimulatorCameraConstraint' setting lookup.

This commit is contained in:
Shyotl
2012-11-29 11:58:41 -06:00
parent 794dbacea3
commit 8b19f82c0b
4 changed files with 7 additions and 6 deletions

View File

@@ -1844,8 +1844,9 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit)
local_camera_offset = gAgent.getFrameAgent().rotateToAbsolute( local_camera_offset );
}
static const LLCachedControl<bool> sg_ignore_sim_cam_consts("SGIgnoreSimulatorCameraConstraints",false);
if ( !mCameraCollidePlane.isExactlyZero()
&& !gSavedSettings.getBOOL("SGIgnoreSimulatorCameraConstraints")
&& !sg_ignore_sim_cam_consts
&& isAgentAvatarValid()
&& !gAgentAvatarp->isSitting())
{