diff options
| author | Homer Horwitz | 2008-11-15 17:19:35 +0000 |
|---|---|---|
| committer | Homer Horwitz | 2008-11-15 17:19:35 +0000 |
| commit | 3fdc445dd14b131c9b5e18f809bf701291deda1e (patch) | |
| tree | c4f52b08b5806558b2a07b617202cdacfedf09e8 | |
| parent | Hack to temporarily fix friends-handling. This will be redone as soon as (diff) | |
| download | opensim-SC_OLD-3fdc445dd14b131c9b5e18f809bf701291deda1e.zip opensim-SC_OLD-3fdc445dd14b131c9b5e18f809bf701291deda1e.tar.gz opensim-SC_OLD-3fdc445dd14b131c9b5e18f809bf701291deda1e.tar.bz2 opensim-SC_OLD-3fdc445dd14b131c9b5e18f809bf701291deda1e.tar.xz | |
Prevent NRE if you do a llSetStatus(STATUS_ROTATION...) on an object that isn't physical.
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index c5f20da..5dbf3b7 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
| @@ -2335,8 +2335,11 @@ if (m_shape != null) { | |||
| 2335 | 2335 | ||
| 2336 | public void SetPhysicsAxisRotation() | 2336 | public void SetPhysicsAxisRotation() |
| 2337 | { | 2337 | { |
| 2338 | PhysActor.LockAngularMotion(RotationAxis); | 2338 | if (PhysActor != null) |
| 2339 | m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor); | 2339 | { |
| 2340 | PhysActor.LockAngularMotion(RotationAxis); | ||
| 2341 | m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor); | ||
| 2342 | } | ||
| 2340 | } | 2343 | } |
| 2341 | 2344 | ||
| 2342 | public void SetScriptEvents(UUID scriptid, int events) | 2345 | public void SetScriptEvents(UUID scriptid, int events) |