From: Dr Schofield <hud@zurich.ibm.com>
the attached patch fixes http://opensimulator.org/mantis/view.php?id=936 aka load-xml/load-xml2 crashing. problem lies with basic physics not creating physics actors. the solution was already present in SceneObjectPart.cs.0.6.0-stable
parent
6efb16689a
commit
24cf685e55
|
@ -89,9 +89,15 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z),
|
||||
new Quaternion(rootPart.RotationOffset.W, rootPart.RotationOffset.X,
|
||||
rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics);
|
||||
|
||||
// to quote from SceneObjectPart: Basic
|
||||
// Physics returns null.. joy joy joy.
|
||||
if (rootPart.PhysActor != null)
|
||||
{
|
||||
rootPart.PhysActor.LocalID = rootPart.LocalId;
|
||||
rootPart.DoPhysicsPropertyUpdate(UsePhysics, true);
|
||||
}
|
||||
}
|
||||
primCount++;
|
||||
}
|
||||
}
|
||||
|
@ -193,9 +199,13 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
new Quaternion(rootPart.RotationOffset.W, rootPart.RotationOffset.X,
|
||||
rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics);
|
||||
|
||||
// to quote from SceneObjectPart: Basic
|
||||
// Physics returns null.. joy joy joy.
|
||||
if (rootPart.PhysActor != null)
|
||||
{
|
||||
rootPart.PhysActor.LocalID = rootPart.LocalId;
|
||||
|
||||
rootPart.DoPhysicsPropertyUpdate(UsePhysics, true);
|
||||
}
|
||||
rootPart.Velocity = receivedVelocity;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue