aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 8c6450d..f13f7ab 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -822,7 +822,8 @@ namespace OpenSim.Region.Framework.Scenes
822 } 822 }
823 823
824 // Tell the physics engines that this prim changed. 824 // Tell the physics engines that this prim changed.
825 ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor); 825 if (ParentGroup != null && ParentGroup.Scene != null && ParentGroup.Scene.PhysicsScene != null)
826 ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor);
826 } 827 }
827 catch (Exception e) 828 catch (Exception e)
828 { 829 {
@@ -940,7 +941,7 @@ namespace OpenSim.Region.Framework.Scenes
940 //m_log.Info("[PART]: RO2:" + actor.Orientation.ToString()); 941 //m_log.Info("[PART]: RO2:" + actor.Orientation.ToString());
941 } 942 }
942 943
943 if (ParentGroup != null) 944 if (ParentGroup != null && ParentGroup.Scene != null && ParentGroup.Scene.PhysicsScene != null)
944 ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor); 945 ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor);
945 //} 946 //}
946 } 947 }