OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get rid of OdeCharacter != null checks since OdeScene._characters can never contain a null character. 

Ignoring the ancient code glyphs not to do this....
0.7.2-post-fixes
Justin Clark-Casey (justincc) 2011-11-21 21:29:56 +00:00
parent 1edfe05c16
commit 0cf5c0837b
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Physics/OdePlugin/OdeScene.cs
View File

@ -1535,12 +1535,6 @@ namespace OpenSim.Region.Physics.OdePlugin
{ {
// Reset the collision values to false // Reset the collision values to false
// since we don't know if we're colliding yet // since we don't know if we're colliding yet
// For some reason this can happen. Don't ask...
//
if (chr == null)
continue;
if (chr.Shell == IntPtr.Zero || chr.Body == IntPtr.Zero) if (chr.Shell == IntPtr.Zero || chr.Body == IntPtr.Zero)
continue; continue;
@ -2058,7 +2052,6 @@ namespace OpenSim.Region.Physics.OdePlugin
//m_log.Debug("RemoveAllJointsConnectedToActor: start"); //m_log.Debug("RemoveAllJointsConnectedToActor: start");
if (actor.SOPName != null && joints_connecting_actor.ContainsKey(actor.SOPName) && joints_connecting_actor[actor.SOPName] != null) if (actor.SOPName != null && joints_connecting_actor.ContainsKey(actor.SOPName) && joints_connecting_actor[actor.SOPName] != null)
{ {
List<PhysicsJoint> jointsToRemove = new List<PhysicsJoint>(); List<PhysicsJoint> jointsToRemove = new List<PhysicsJoint>();
//TODO: merge these 2 loops (originally it was needed to avoid altering a list being iterated over, but it is no longer needed due to the joint request queue mechanism) //TODO: merge these 2 loops (originally it was needed to avoid altering a list being iterated over, but it is no longer needed due to the joint request queue mechanism)
foreach (PhysicsJoint j in joints_connecting_actor[actor.SOPName]) foreach (PhysicsJoint j in joints_connecting_actor[actor.SOPName])
@ -2787,10 +2780,7 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name);
// Move characters // Move characters
foreach (OdeCharacter actor in _characters) foreach (OdeCharacter actor in _characters)
{
if (actor != null)
actor.Move(defects); actor.Move(defects);
}
if (defects.Count != 0) if (defects.Count != 0)
{ {
@ -2858,15 +2848,12 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name);
} }
foreach (OdeCharacter actor in _characters) foreach (OdeCharacter actor in _characters)
{
if (actor != null)
{ {
if (actor.bad) if (actor.bad)
m_log.WarnFormat("[PHYSICS]: BAD Actor {0} in _characters list was not removed?", actor.m_uuid); m_log.WarnFormat("[PHYSICS]: BAD Actor {0} in _characters list was not removed?", actor.m_uuid);
actor.UpdatePositionAndVelocity(defects); actor.UpdatePositionAndVelocity(defects);
} }
}
if (defects.Count != 0) if (defects.Count != 0)
{ {