aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-19 15:20:38 -0700
committerJohn Hurliman2009-10-19 15:20:38 -0700
commit72078195c282a6fa314c3f0ba4caae0b895dc821 (patch)
tree61183b179798114f83b0bbc9815a840716593984
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim into priorit... (diff)
parentForgot {} on last commit. (diff)
downloadopensim-SC_OLD-72078195c282a6fa314c3f0ba4caae0b895dc821.zip
opensim-SC_OLD-72078195c282a6fa314c3f0ba4caae0b895dc821.tar.gz
opensim-SC_OLD-72078195c282a6fa314c3f0ba4caae0b895dc821.tar.bz2
opensim-SC_OLD-72078195c282a6fa314c3f0ba4caae0b895dc821.tar.xz
Merge branch 'prioritization' of ssh://opensimulator.org/var/git/opensim into prioritization
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 0c94fb6..ba289f7 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -2986,7 +2986,11 @@ namespace OpenSim.Region.Physics.OdePlugin
2986 foreach (OdeCharacter actor in _characters) 2986 foreach (OdeCharacter actor in _characters)
2987 { 2987 {
2988 if (actor != null) 2988 if (actor != null)
2989 {
2990 if (actor.bad)
2991 m_log.WarnFormat("[PHYSICS]: BAD Actor {0} in _characters list was not removed?", actor.m_uuid);
2989 actor.UpdatePositionAndVelocity(); 2992 actor.UpdatePositionAndVelocity();
2993 }
2990 } 2994 }
2991 } 2995 }
2992 2996