Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

1 files changed, 1 insertions, 13 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 431f3dc..0b92818 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2145,19 +2145,7 @@ namespace OpenSim.Region.Framework.Scenes
                     sourcePart.Inventory.RemoveInventoryItem(item.ItemID);
             }
                                     
-            AddNewSceneObject(group, true);
-            
-            group.AbsolutePosition = pos;
-            group.Velocity = vel;            
-            
-            if (rot != null)
-                group.UpdateGroupRotationR((Quaternion)rot);
-            
-            // TODO: This needs to be refactored with the similar code in 
-            // SceneGraph.AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, Vector3 pos, Quaternion rot, Vector3 vel)
-            // possibly by allowing this method to take a null rotation.
-            if (group.RootPart.PhysActor != null && group.RootPart.PhysActor.IsPhysical && vel != Vector3.Zero)
-                group.RootPart.ApplyImpulse((vel * group.GetMass()), false);
+            AddNewSceneObject(group, true, pos, rot, vel);
             
             // We can only call this after adding the scene object, since the scene object references the scene
             // to find out if scripts should be activated at all.