ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 10:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Fix some threading issues in BulletXNA (the managed bullet library), this should better allow you to run it in multiple region scenarios (but why would you really want to do that?) Source in OpenSimLibs.

Browse Source 
* Fixed a null ref during shutdown.
This commit is contained in:
teravus
2013-08-20 21:09:17 -05:00
parent 4a81465b91
commit a6af561660
4 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@@ -4089,7 +4089,7 @@ namespace OpenSim.Region.Framework.Scenes
// For now, we use the NINJA naming scheme for identifying joints.
// In the future, we can support other joint specification schemes such as a
// custom checkbox in the viewer GUI.
if (ParentGroup.Scene != null && ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints)
if (ParentGroup.Scene != null && ParentGroup.Scene.PhysicsScene != null && ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints)
{
return IsHingeJoint() || IsBallJoint();
}
@@ -4413,7 +4413,8 @@ namespace OpenSim.Region.Framework.Scenes
public void RemoveFromPhysics()
{
ParentGroup.Scene.EventManager.TriggerObjectRemovedFromPhysicalScene(this);
ParentGroup.Scene.PhysicsScene.RemovePrim(PhysActor);
if (ParentGroup.Scene.PhysicsScene != null)
ParentGroup.Scene.PhysicsScene.RemovePrim(PhysActor);
PhysActor = null;
}