diff options
| author | Melanie | 2012-08-07 20:20:28 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-07 20:20:28 +0100 |
| commit | 85b4eab0058982dc09697362ff1f69d2786cd42b (patch) | |
| tree | c5dfc3765c9fd20afcdccb7f87001c3248d11a6d /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: update SOs and DLLs to run on more Linux versions. Correct multipl... (diff) | |
| download | opensim-SC-85b4eab0058982dc09697362ff1f69d2786cd42b.zip opensim-SC-85b4eab0058982dc09697362ff1f69d2786cd42b.tar.gz opensim-SC-85b4eab0058982dc09697362ff1f69d2786cd42b.tar.bz2 opensim-SC-85b4eab0058982dc09697362ff1f69d2786cd42b.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSScene.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index 011033c..7151908 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
| @@ -352,7 +352,7 @@ public class BSScene : PhysicsScene, IPhysicsParameters | |||
| 352 | BSPrim bsprim = prim as BSPrim; | 352 | BSPrim bsprim = prim as BSPrim; |
| 353 | if (bsprim != null) | 353 | if (bsprim != null) |
| 354 | { | 354 | { |
| 355 | m_log.DebugFormat("{0}: RemovePrim. id={1}/{2}", LogHeader, bsprim.Name, bsprim.LocalID); | 355 | // m_log.DebugFormat("{0}: RemovePrim. id={1}/{2}", LogHeader, bsprim.Name, bsprim.LocalID); |
| 356 | try | 356 | try |
| 357 | { | 357 | { |
| 358 | lock (m_prims) m_prims.Remove(bsprim.LocalID); | 358 | lock (m_prims) m_prims.Remove(bsprim.LocalID); |