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

Merge branch 'avination' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
This commit is contained in:
Melanie
2012-11-04 22:37:28 +00:00
parent d0473b73da 7e91a787fb
commit dd416298f1
11 changed files with 72 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -813,7 +813,7 @@ namespace OpenSim.Region.Framework.Scenes
actor.Orientation = GetWorldRotation();
// Tell the physics engines that this prim changed.
if (ParentGroup.Scene != null)
if (ParentGroup.Scene != null && ParentGroup.Scene.PhysicsScene != null)
ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor);
}