Merge branch 'master' into careminster

This commit is contained in:
Melanie
2011-12-22 19:52:59 +00:00
5 changed files with 23 additions and 8 deletions

View File

@@ -374,7 +374,6 @@ namespace OpenSim.Region.Framework.Scenes
if (rot != null)
sceneObject.UpdateGroupRotationR((Quaternion)rot);
//group.ApplyPhysics(m_physicalPrim);
if (sceneObject.RootPart.PhysActor != null && sceneObject.RootPart.PhysActor.IsPhysical && vel != Vector3.Zero)
{
sceneObject.RootPart.ApplyImpulse((vel * sceneObject.GetMass()), false);