From 3fdc445dd14b131c9b5e18f809bf701291deda1e Mon Sep 17 00:00:00 2001
From: Homer Horwitz
Date: Sat, 15 Nov 2008 17:19:35 +0000
Subject: Prevent NRE if you do a llSetStatus(STATUS_ROTATION...) on an object
 that isn't physical.

---
 OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 7 +++++--
 1 file 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) {
 
         public void SetPhysicsAxisRotation()
         {
-            PhysActor.LockAngularMotion(RotationAxis);
-            m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor);
+            if (PhysActor != null)
+            {
+                PhysActor.LockAngularMotion(RotationAxis);
+                m_parentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor);
+            }
         }
 
         public void SetScriptEvents(UUID scriptid, int events)
-- 
cgit v1.1