OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '732e9373795a35ed1965bbb93a02117fcf0a8c3e' into bigmerge

avinationmerge
Melanie 2011-10-25 01:53:02 +01:00
parent e43e1b49db 732e937379
commit 28d2103439
1 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4466,9 +4466,7 @@ namespace OpenSim.Region.Framework.Scenes
if (ParentGroup.Scene == null) if (ParentGroup.Scene == null)
return; return;
PhysicsActor pa = PhysActor; if (PhysActor == null)
if (pa == null)
{ {
// It's not phantom anymore. So make sure the physics engine get's knowledge of it // It's not phantom anymore. So make sure the physics engine get's knowledge of it
PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape( PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
@ -4480,9 +4478,6 @@ namespace OpenSim.Region.Framework.Scenes
UsePhysics, UsePhysics,
m_localId); m_localId);
pa = PhysActor;
if (pa != null)
{
PhysActor.SetMaterial(Material); PhysActor.SetMaterial(Material);
DoPhysicsPropertyUpdate(UsePhysics, true); DoPhysicsPropertyUpdate(UsePhysics, true);
@ -4508,10 +4503,9 @@ namespace OpenSim.Region.Framework.Scenes
PhysActor.SubscribeEvents(1000); PhysActor.SubscribeEvents(1000);
} }
} }
}
else // it already has a physical representation else // it already has a physical representation
{ {
pa.IsPhysical = UsePhysics; PhysActor.IsPhysical = UsePhysics;
DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status. If it's phantom this will remove the prim DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status. If it's phantom this will remove the prim