diff options
| author | Melanie Thielker | 2014-06-21 00:21:29 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-06-21 00:21:29 +0200 |
| commit | 711441f9227fb8518fce21f7be92b66c442f877a (patch) | |
| tree | 6a335f56d92f9c8bd9ec8bdae59250e37532538e /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |
| parent | Add forgotten file (diff) | |
| parent | BulletSim: stop an avatar from moving if standing on a stationary (diff) | |
| download | opensim-SC-711441f9227fb8518fce21f7be92b66c442f877a.zip opensim-SC-711441f9227fb8518fce21f7be92b66c442f877a.tar.gz opensim-SC-711441f9227fb8518fce21f7be92b66c442f877a.tar.bz2 opensim-SC-711441f9227fb8518fce21f7be92b66c442f877a.tar.xz | |
Merge commit '84eb25da23765b3a4f7ae5513e8a238680bb99f2'
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 e6aefd5..9818b05 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
| @@ -463,7 +463,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
| 463 | 463 | ||
| 464 | if (!m_initialized) return null; | 464 | if (!m_initialized) return null; |
| 465 | 465 | ||
| 466 | DetailLog("{0},BSScene.AddPrimShape,call", localID); | 466 | // DetailLog("{0},BSScene.AddPrimShape,call", localID); |
| 467 | 467 | ||
| 468 | BSPhysObject prim = new BSPrimLinkable(localID, primName, this, position, size, rotation, pbs, isPhysical); | 468 | BSPhysObject prim = new BSPrimLinkable(localID, primName, this, position, size, rotation, pbs, isPhysical); |
| 469 | lock (PhysObjects) PhysObjects.Add(localID, prim); | 469 | lock (PhysObjects) PhysObjects.Add(localID, prim); |