diff options
| author | Melanie | 2012-10-30 21:19:00 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-30 21:19:00 +0100 |
| commit | 5328808b1825ef7d73809c8ddd67542ee05bf575 (patch) | |
| tree | b45877393fe0c8cc9bfe841f2c9298609bbdc68b /OpenSim/Region/Framework/Scenes | |
| parent | Set the script state to new rez when a scriptis saved, rather than region start. (diff) | |
| download | opensim-SC-5328808b1825ef7d73809c8ddd67542ee05bf575.zip opensim-SC-5328808b1825ef7d73809c8ddd67542ee05bf575.tar.gz opensim-SC-5328808b1825ef7d73809c8ddd67542ee05bf575.tar.bz2 opensim-SC-5328808b1825ef7d73809c8ddd67542ee05bf575.tar.xz | |
Make sure we're not accessing a physics scene if we're not in one yet.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 49b771f..165dd85 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -813,7 +813,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 813 | actor.Orientation = GetWorldRotation(); | 813 | actor.Orientation = GetWorldRotation(); |
| 814 | 814 | ||
| 815 | // Tell the physics engines that this prim changed. | 815 | // Tell the physics engines that this prim changed. |
| 816 | if (ParentGroup.Scene != null) | 816 | if (ParentGroup.Scene != null && ParentGroup.Scene.PhysicsScene != null) |
| 817 | ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor); | 817 | ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor); |
| 818 | } | 818 | } |
| 819 | 819 | ||