diff options
| author | Mic Bowman | 2012-04-25 09:52:44 -0700 |
|---|---|---|
| committer | Mic Bowman | 2012-04-25 09:52:44 -0700 |
| commit | 1afae013111b7c817037371fca805a78c3ab67cc (patch) | |
| tree | dc4f08217c64fd92f4fac250344f009f583fca4e /OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |
| parent | Add try/catch around Json script method registration to avoild some issues (diff) | |
| parent | Slight rewording of output messages. (diff) | |
| download | opensim-SC-1afae013111b7c817037371fca805a78c3ab67cc.zip opensim-SC-1afae013111b7c817037371fca805a78c3ab67cc.tar.gz opensim-SC-1afae013111b7c817037371fca805a78c3ab67cc.tar.bz2 opensim-SC-1afae013111b7c817037371fca805a78c3ab67cc.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -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); |