diff options
author | Teravus Ovares | 2009-07-21 03:18:19 +0000 |
---|---|---|
committer | Teravus Ovares | 2009-07-21 03:18:19 +0000 |
commit | 5c8fe5c01cf25b64013fdb95599ab8aeaa1866aa (patch) | |
tree | aef9a79791d5c3e29e07d9b4a0515d82184da540 /OpenSim/Region/Framework | |
parent | add rick to contributors file (diff) | |
download | opensim-SC_OLD-5c8fe5c01cf25b64013fdb95599ab8aeaa1866aa.zip opensim-SC_OLD-5c8fe5c01cf25b64013fdb95599ab8aeaa1866aa.tar.gz opensim-SC_OLD-5c8fe5c01cf25b64013fdb95599ab8aeaa1866aa.tar.bz2 opensim-SC_OLD-5c8fe5c01cf25b64013fdb95599ab8aeaa1866aa.tar.xz |
* Fixed a case where a prim was a NullPhysicsActor instead of an OdePrim
* Commented logic that wasn't being used.
* This should fix the errors in OdeScene.near
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 2a8436b..6850312 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1219,7 +1219,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1219 | m_followCamAuto = ((m_CameraUpAxis.Z > 0.959f && m_CameraUpAxis.Z < 0.98f) | 1219 | m_followCamAuto = ((m_CameraUpAxis.Z > 0.959f && m_CameraUpAxis.Z < 0.98f) |
1220 | && (Math.Abs(camdif.X) < 0.4f && Math.Abs(camdif.Y) < 0.4f)) ? true : false; | 1220 | && (Math.Abs(camdif.X) < 0.4f && Math.Abs(camdif.Y) < 0.4f)) ? true : false; |
1221 | 1221 | ||
1222 | 1222 | //m_log.DebugFormat("[FollowCam]: {0}", m_followCamAuto); | |
1223 | // Raycast from the avatar's head to the camera to see if there's anything blocking the view | 1223 | // Raycast from the avatar's head to the camera to see if there's anything blocking the view |
1224 | if ((m_movementUpdateCount % NumMovementsBetweenRayCast) == 0 && m_scene.PhysicsScene.SupportsRayCast()) | 1224 | if ((m_movementUpdateCount % NumMovementsBetweenRayCast) == 0 && m_scene.PhysicsScene.SupportsRayCast()) |
1225 | { | 1225 | { |