2 files changed, 6 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 750b5b9..4db735a 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -2472,7 +2472,12 @@ namespace OpenSim.Region.Environment.Scenes
                     }
                     group.UpdateGroupRotation(rot);
                     //group.ApplyPhysics(m_physicalPrim);
-                    group.Velocity = vel;
+                    if (group.RootPart.PhysActor != null && group.RootPart.PhysActor.IsPhysical && vel != Vector3.Zero)
+                    {
+                        group.RootPart.ApplyImpulse(vel, false);
+                        group.Velocity = vel;
+                        rootPart.ScheduleFullUpdate();
+                    }
                     group.CreateScriptInstances(param, true, DefaultScriptEngine, 2);
                     rootPart.ScheduleFullUpdate();
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 8fd1ba3..51393a9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2491,7 +2491,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                     if (new_group.RootPart.PhysActor != null && new_group.RootPart.PhysActor.IsPhysical && llvel != Vector3.Zero)
                     {
-                        new_group.RootPart.ApplyImpulse(llvel, false);
                         //Recoil.
                         llApplyImpulse(new LSL_Vector(llvel.X * groupmass, llvel.Y * groupmass, llvel.Z * groupmass), 0);
                     }