diff options
| author | Jeff Ames | 2008-03-19 19:33:38 +0000 |
|---|---|---|
| committer | Jeff Ames | 2008-03-19 19:33:38 +0000 |
| commit | 84289cfb4b676e2df38d37602a8bb7811cc38d18 (patch) | |
| tree | 119b29ff066e11d0ddbba15f4139b7892a365135 | |
| parent | * Adding log debugging messages and making others more explicit (diff) | |
| download | opensim-SC_OLD-84289cfb4b676e2df38d37602a8bb7811cc38d18.zip opensim-SC_OLD-84289cfb4b676e2df38d37602a8bb7811cc38d18.tar.gz opensim-SC_OLD-84289cfb4b676e2df38d37602a8bb7811cc38d18.tar.bz2 opensim-SC_OLD-84289cfb4b676e2df38d37602a8bb7811cc38d18.tar.xz | |
Fix server crash when setting prims physical under basic physics.
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 4c96e4e..67048bf 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
| @@ -1329,8 +1329,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 1329 | new PhysicsVector(Scale.X, Scale.Y, Scale.Z), | 1329 | new PhysicsVector(Scale.X, Scale.Y, Scale.Z), |
| 1330 | new Quaternion(RotationOffset.W, RotationOffset.X, | 1330 | new Quaternion(RotationOffset.W, RotationOffset.X, |
| 1331 | RotationOffset.Y, RotationOffset.Z), usePhysics); | 1331 | RotationOffset.Y, RotationOffset.Z), usePhysics); |
| 1332 | PhysActor.LocalID = LocalId; | 1332 | |
| 1333 | DoPhysicsPropertyUpdate(usePhysics, true); | 1333 | if (PhysActor != null) |
| 1334 | { | ||
| 1335 | PhysActor.LocalID = LocalId; | ||
| 1336 | DoPhysicsPropertyUpdate(usePhysics, true); | ||
| 1337 | } | ||
| 1334 | } | 1338 | } |
| 1335 | else | 1339 | else |
| 1336 | { | 1340 | { |