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/SceneXmlLoader.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/SceneXmlLoader.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs index 3b5fc57..5c460be 100644 --- a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs +++ b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs | |||
| @@ -55,7 +55,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 55 | new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z), | 55 | new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z), |
| 56 | new Quaternion(rootPart.RotationOffset.W, rootPart.RotationOffset.X, | 56 | new Quaternion(rootPart.RotationOffset.W, rootPart.RotationOffset.X, |
| 57 | rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics); | 57 | rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics); |
| 58 | rootPart.doPhysicsPropertyUpdate(UsePhysics); | 58 | rootPart.doPhysicsPropertyUpdate(UsePhysics, true); |
| 59 | 59 | ||
| 60 | } | 60 | } |
| 61 | primCount++; | 61 | primCount++; |
| @@ -125,7 +125,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 125 | new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z), | 125 | new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z), |
| 126 | new Quaternion(rootPart.RotationOffset.W, rootPart.RotationOffset.X, | 126 | new Quaternion(rootPart.RotationOffset.W, rootPart.RotationOffset.X, |
| 127 | rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics); | 127 | rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics); |
| 128 | rootPart.doPhysicsPropertyUpdate(UsePhysics); | 128 | rootPart.doPhysicsPropertyUpdate(UsePhysics, true); |
| 129 | } | 129 | } |
| 130 | } | 130 | } |
| 131 | 131 | ||