ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
This commit is contained in:
Melanie
2013-02-15 21:42:16 +00:00
parent 945bf9808c e09467b30d
commit ea8c5ba707
13 changed files with 270 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4738,7 +4738,9 @@ namespace OpenSim.Region.Framework.Scenes
}
PhysActor = pa;
}
ParentGroup.Scene.EventManager.TriggerObjectAddedToPhysicalScene(this);
}
/// <summary>
/// This removes the part from the physics scene.
@@ -4757,6 +4759,8 @@ namespace OpenSim.Region.Framework.Scenes
pa.OnOutOfBounds -= PhysicsOutOfBounds;
ParentGroup.Scene.PhysicsScene.RemovePrim(pa);
ParentGroup.Scene.EventManager.TriggerObjectRemovedFromPhysicalScene(this);
}
PhysActor = null;
}