diff options
author | Teravus Ovares | 2007-11-20 04:38:08 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-11-20 04:38:08 +0000 |
commit | 5a71d03b7ac1de0b599f651c62bf1e33a3d1745d (patch) | |
tree | dd85b6f7d5fb5069fd281a70dd79e6daf267a1bd /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | POS physics. tweaking stair-climbing which broke with my last change (diff) | |
download | opensim-SC-5a71d03b7ac1de0b599f651c62bf1e33a3d1745d.zip opensim-SC-5a71d03b7ac1de0b599f651c62bf1e33a3d1745d.tar.gz opensim-SC-5a71d03b7ac1de0b599f651c62bf1e33a3d1745d.tar.bz2 opensim-SC-5a71d03b7ac1de0b599f651c62bf1e33a3d1745d.tar.xz |
*Huge* structural changes in ODE/OdePrim to get all of the calls in threadlocked code. ODEPrim was almost completely re-written.
Copy/Space test needed.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index dcba9bd..405f2e3 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -604,7 +604,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
604 | new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z), | 604 | new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z), |
605 | new Quaternion(rootPart.RotationOffset.W, rootPart.RotationOffset.X, | 605 | new Quaternion(rootPart.RotationOffset.W, rootPart.RotationOffset.X, |
606 | rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics); | 606 | rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics); |
607 | rootPart.doPhysicsPropertyUpdate(UsePhysics); | 607 | rootPart.doPhysicsPropertyUpdate(UsePhysics, true); |
608 | } | 608 | } |
609 | MainLog.Instance.Verbose("Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)"); | 609 | MainLog.Instance.Verbose("Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)"); |
610 | } | 610 | } |
@@ -657,7 +657,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
657 | new PhysicsVector(shape.Scale.X, shape.Scale.Y, shape.Scale.Z), | 657 | new PhysicsVector(shape.Scale.X, shape.Scale.Y, shape.Scale.Z), |
658 | new Quaternion(), UsePhysics); | 658 | new Quaternion(), UsePhysics); |
659 | // subscribe to physics events. | 659 | // subscribe to physics events. |
660 | rootPart.doPhysicsPropertyUpdate(UsePhysics); | 660 | rootPart.doPhysicsPropertyUpdate(UsePhysics, true); |
661 | 661 | ||
662 | } | 662 | } |
663 | } | 663 | } |