dont do recoil on llRezObject called from attachments, as seem to happen

 at sl

1 files changed, 13 insertions, 8 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 702993b..5141e0e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3269,6 +3269,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 if (new_groups == null)
                     return;
 
+                bool notAttachment = !m_host.ParentGroup.IsAttachment;
+
                 foreach (SceneObjectGroup group in new_groups)
                 {
                     // objects rezzed with this method are die_at_edge by default.
@@ -3282,17 +3284,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             group.RootPart.UUID.ToString()) },
                             new DetectParams[0]));
 
-                    float groupmass = group.GetMass();
+                    if (notAttachment)
+                    {
+                        float groupmass = group.GetMass();
 
-                    PhysicsActor pa = group.RootPart.PhysActor;
+                        PhysicsActor pa = group.RootPart.PhysActor;
 
-                    //Recoil.
-                    if (pa != null && pa.IsPhysical && (Vector3)vel != Vector3.Zero)
-                    {
-                        Vector3 recoil = -vel * groupmass * m_recoilScaleFactor;
-                        if (recoil != Vector3.Zero)
+                        //Recoil.
+                        if (pa != null && pa.IsPhysical && (Vector3)vel != Vector3.Zero)
                         {
-                            llApplyImpulse(recoil, 0);
+                            Vector3 recoil = -vel * groupmass * m_recoilScaleFactor;
+                            if (recoil != Vector3.Zero)
+                            {
+                                llApplyImpulse(recoil, 0);
+                            }
                         }
                     }
                     // Variable script delay? (see (http://wiki.secondlife.com/wiki/LSL_Delay)