diff options
| author | Justin Clark-Casey (justincc) | 2013-04-02 00:46:53 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-04-02 00:46:53 +0100 |
| commit | 600087ab49e9489e37471ccfb7360ac14d31b7f2 (patch) | |
| tree | 7fd908e81185346da6d0bd3561c2712519942117 /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |
| parent | Change recent MSSQL migrations to drop COLUMN from ALTER TABLE which is eithe... (diff) | |
| parent | BulletSim: stop an avatar from moving if standing on a stationary (diff) | |
| download | opensim-SC_OLD-600087ab49e9489e37471ccfb7360ac14d31b7f2.zip opensim-SC_OLD-600087ab49e9489e37471ccfb7360ac14d31b7f2.tar.gz opensim-SC_OLD-600087ab49e9489e37471ccfb7360ac14d31b7f2.tar.bz2 opensim-SC_OLD-600087ab49e9489e37471ccfb7360ac14d31b7f2.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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); |