diff options
| author | Melanie | 2012-04-22 15:06:06 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-22 15:06:06 +0100 |
| commit | 8df4bd14f59ec6235cd7a02d74e69e530256b610 (patch) | |
| tree | ee80b18ea802be18aaf24a7045afdd2e444b107a /OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Comment out spurious Body != IntPtr.Zero code after disableBody(), since disa... (diff) | |
| download | opensim-SC-8df4bd14f59ec6235cd7a02d74e69e530256b610.zip opensim-SC-8df4bd14f59ec6235cd7a02d74e69e530256b610.tar.gz opensim-SC-8df4bd14f59ec6235cd7a02d74e69e530256b610.tar.bz2 opensim-SC-8df4bd14f59ec6235cd7a02d74e69e530256b610.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/OdeScene.cs')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 842ff91..409b27b 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
| @@ -2226,7 +2226,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 2226 | /// <param name="prim"></param> | 2226 | /// <param name="prim"></param> |
| 2227 | internal void RemovePrimThreadLocked(OdePrim prim) | 2227 | internal void RemovePrimThreadLocked(OdePrim prim) |
| 2228 | { | 2228 | { |
| 2229 | //Console.WriteLine("RemovePrimThreadLocked " + prim.m_primName); | 2229 | // m_log.DebugFormat("[ODE SCENE]: Removing physical prim {0} {1}", prim.Name, prim.LocalID); |
| 2230 | |||
| 2230 | lock (prim) | 2231 | lock (prim) |
| 2231 | { | 2232 | { |
| 2232 | RemoveCollisionEventReporting(prim); | 2233 | RemoveCollisionEventReporting(prim); |