diff options
author | Robert Adams | 2013-02-07 21:57:31 -0800 |
---|---|---|
committer | Robert Adams | 2013-02-08 16:29:29 -0800 |
commit | 1b203601f43662541526369f540dd04f5b485be6 (patch) | |
tree | 418bae04970c59ed4ab7653686843bc2e916b730 /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |
parent | BulletSim: reclass BSPrim into layers so linkset and physical world displacem... (diff) | |
download | opensim-SC-1b203601f43662541526369f540dd04f5b485be6.zip opensim-SC-1b203601f43662541526369f540dd04f5b485be6.tar.gz opensim-SC-1b203601f43662541526369f540dd04f5b485be6.tar.bz2 opensim-SC-1b203601f43662541526369f540dd04f5b485be6.tar.xz |
BulletSim: include the linkage to the layered prim implementation. Separate layers for physical (vs simulator) location displacement and linksets.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSScene.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index f8a0c1e..e506d22 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
@@ -434,7 +434,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
434 | { | 434 | { |
435 | if (!m_initialized) return; | 435 | if (!m_initialized) return; |
436 | 436 | ||
437 | BSPrim bsprim = prim as BSPrim; | 437 | BSPhysObject bsprim = prim as BSPhysObject; |
438 | if (bsprim != null) | 438 | if (bsprim != null) |
439 | { | 439 | { |
440 | DetailLog("{0},RemovePrim,call", bsprim.LocalID); | 440 | DetailLog("{0},RemovePrim,call", bsprim.LocalID); |
@@ -465,7 +465,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
465 | 465 | ||
466 | DetailLog("{0},AddPrimShape,call", localID); | 466 | DetailLog("{0},AddPrimShape,call", localID); |
467 | 467 | ||
468 | BSPrim prim = new BSPrim(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); |
470 | return prim; | 470 | return prim; |
471 | } | 471 | } |