diff options
author | Teravus Ovares | 2008-03-14 05:22:52 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-03-14 05:22:52 +0000 |
commit | abacfba287efe89ead9bff529d62f65a253eceb8 (patch) | |
tree | a6562417f9bdfa499bfae9f50caffbf11e713ea4 /OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs | |
parent | Update svn properties. (diff) | |
download | opensim-SC_OLD-abacfba287efe89ead9bff529d62f65a253eceb8.zip opensim-SC_OLD-abacfba287efe89ead9bff529d62f65a253eceb8.tar.gz opensim-SC_OLD-abacfba287efe89ead9bff529d62f65a253eceb8.tar.bz2 opensim-SC_OLD-abacfba287efe89ead9bff529d62f65a253eceb8.tar.xz |
* Preliminary work with the ODEPlugin to collect collision data.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs index 2b05bb6..8666862 100644 --- a/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs +++ b/OpenSim/Region/Environment/Scenes/SceneXmlLoader.cs | |||
@@ -90,6 +90,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
90 | new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z), | 90 | new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z), |
91 | new Quaternion(rootPart.RotationOffset.W, rootPart.RotationOffset.X, | 91 | new Quaternion(rootPart.RotationOffset.W, rootPart.RotationOffset.X, |
92 | rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics); | 92 | rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics); |
93 | rootPart.PhysActor.LocalID = rootPart.LocalId; | ||
93 | rootPart.DoPhysicsPropertyUpdate(UsePhysics, true); | 94 | rootPart.DoPhysicsPropertyUpdate(UsePhysics, true); |
94 | } | 95 | } |
95 | primCount++; | 96 | primCount++; |
@@ -192,6 +193,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
192 | new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z), | 193 | new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z), |
193 | new Quaternion(rootPart.RotationOffset.W, rootPart.RotationOffset.X, | 194 | new Quaternion(rootPart.RotationOffset.W, rootPart.RotationOffset.X, |
194 | rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics); | 195 | rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics); |
196 | |||
197 | rootPart.PhysActor.LocalID = rootPart.LocalId; | ||
198 | |||
195 | rootPart.DoPhysicsPropertyUpdate(UsePhysics, true); | 199 | rootPart.DoPhysicsPropertyUpdate(UsePhysics, true); |
196 | rootPart.Velocity = receivedVelocity; | 200 | rootPart.Velocity = receivedVelocity; |
197 | } | 201 | } |