diff options
| author | Mic Bowman | 2013-02-08 22:43:56 -0800 |
|---|---|---|
| committer | Mic Bowman | 2013-02-08 22:43:56 -0800 |
| commit | 0a297a0e52b673427ff61b254f6065c217b1375d (patch) | |
| tree | aa337fff2dfda8677a7a76eb08b76a1d07df178a /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |
| parent | Make JsonStore path parsing more robust. Should fix the (diff) | |
| parent | Fixed ReadSculptData(): the check whether there are enough bytes to read was ... (diff) | |
| download | opensim-SC-0a297a0e52b673427ff61b254f6065c217b1375d.zip opensim-SC-0a297a0e52b673427ff61b254f6065c217b1375d.tar.gz opensim-SC-0a297a0e52b673427ff61b254f6065c217b1375d.tar.bz2 opensim-SC-0a297a0e52b673427ff61b254f6065c217b1375d.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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index f8a0c1e..05722b8 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); |
| @@ -463,9 +463,9 @@ 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},AddPrimShape,call", localID); | 466 | DetailLog("{0},BSScene.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 | } |