diff options
author | Justin Clark-Casey (justincc) | 2012-04-03 09:28:17 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-04-03 09:28:17 +0100 |
commit | 633f4bb3d80decf4773ee577bacb153fbb4be738 (patch) | |
tree | e70c777f462a17d73a5bc0db59aefa63aa6d781d /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Fix more SOP.PhysActor race conditions in LSL_Api (diff) | |
download | opensim-SC-633f4bb3d80decf4773ee577bacb153fbb4be738.zip opensim-SC-633f4bb3d80decf4773ee577bacb153fbb4be738.tar.gz opensim-SC-633f4bb3d80decf4773ee577bacb153fbb4be738.tar.bz2 opensim-SC-633f4bb3d80decf4773ee577bacb153fbb4be738.tar.xz |
remove possible PhysActor unexpectedly null race conditions when changing prim collision status
factor out common SOP physics scene adding code into a common SOP.AddToPhysics() that is the counterpart to the existing RemoveFromPhysics()
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 29825a2..d8cac66 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2163,12 +2163,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2163 | part.RemoveFromPhysics(); | 2163 | part.RemoveFromPhysics(); |
2164 | } | 2164 | } |
2165 | } | 2165 | } |
2166 | |||
2167 | // if (rootPart.PhysActor != null) | ||
2168 | // { | ||
2169 | // PhysicsScene.RemovePrim(rootPart.PhysActor); | ||
2170 | // rootPart.PhysActor = null; | ||
2171 | // } | ||
2172 | 2166 | ||
2173 | if (UnlinkSceneObject(group, false)) | 2167 | if (UnlinkSceneObject(group, false)) |
2174 | { | 2168 | { |