diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Region/RestartModule.cs
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-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 59a453a..cf03d7c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -4522,7 +4522,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4522 | // For now, we use the NINJA naming scheme for identifying joints. | 4522 | // For now, we use the NINJA naming scheme for identifying joints. |
4523 | // In the future, we can support other joint specification schemes such as a | 4523 | // In the future, we can support other joint specification schemes such as a |
4524 | // custom checkbox in the viewer GUI. | 4524 | // custom checkbox in the viewer GUI. |
4525 | if (ParentGroup.Scene != null && ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints) | 4525 | if (ParentGroup.Scene != null && ParentGroup.Scene.PhysicsScene != null && ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints) |
4526 | { | 4526 | { |
4527 | return IsHingeJoint() || IsBallJoint(); | 4527 | return IsHingeJoint() || IsBallJoint(); |
4528 | } | 4528 | } |