1 files changed, 212 insertions, 163 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index ce1c364..d6aafaf 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -226,6 +226,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llResetScript()
         {
             m_host.AddScriptLPS(1);
+
+            // We need to tell the URL module, if we hav one, to release
+            // the allocated URLs
+            if (m_UrlModule != null)
+                m_UrlModule.ScriptRemoved(m_item.ItemID);
+
             m_ScriptEngine.ApiResetScript(m_item.ItemID);
         }
 
@@ -332,34 +338,39 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public List<SceneObjectPart> GetLinkParts(int linkType)
         {
+            return GetLinkParts(m_host, linkType);
+        }
+
+        private List<SceneObjectPart> GetLinkParts(SceneObjectPart part, int linkType)
+        {
             List<SceneObjectPart> ret = new List<SceneObjectPart>();
-            if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
+            if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
                 return ret;
-            ret.Add(m_host);
+            ret.Add(part);
 
             switch (linkType)
             {
             case ScriptBaseClass.LINK_SET:
-                return new List<SceneObjectPart>(m_host.ParentGroup.Parts);
+                return new List<SceneObjectPart>(part.ParentGroup.Parts);
 
             case ScriptBaseClass.LINK_ROOT:
                 ret = new List<SceneObjectPart>();
-                ret.Add(m_host.ParentGroup.RootPart);
+                ret.Add(part.ParentGroup.RootPart);
                 return ret;
 
             case ScriptBaseClass.LINK_ALL_OTHERS:
-                ret = new List<SceneObjectPart>(m_host.ParentGroup.Parts);
+                ret = new List<SceneObjectPart>(part.ParentGroup.Parts);
 
-                if (ret.Contains(m_host))
-                    ret.Remove(m_host);
+                if (ret.Contains(part))
+                    ret.Remove(part);
 
                 return ret;
 
             case ScriptBaseClass.LINK_ALL_CHILDREN:
-                ret = new List<SceneObjectPart>(m_host.ParentGroup.Parts);
+                ret = new List<SceneObjectPart>(part.ParentGroup.Parts);
 
-                if (ret.Contains(m_host.ParentGroup.RootPart))
-                    ret.Remove(m_host.ParentGroup.RootPart);
+                if (ret.Contains(part.ParentGroup.RootPart))
+                    ret.Remove(part.ParentGroup.RootPart);
                 return ret;
 
             case ScriptBaseClass.LINK_THIS:
@@ -369,7 +380,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 if (linkType < 0)
                     return new List<SceneObjectPart>();
 
-                SceneObjectPart target = m_host.ParentGroup.GetLinkNumPart(linkType);
+                SceneObjectPart target = part.ParentGroup.GetLinkNumPart(linkType);
                 if (target == null)
                     return new List<SceneObjectPart>();
                 ret = new List<SceneObjectPart>();
@@ -1764,13 +1775,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 try
                 {
-                    parts[0].ParentGroup.areUpdatesSuspended = true;
                     foreach (SceneObjectPart part in parts)
                         SetAlpha(part, alpha, face);
                 }
                 finally
                 {
-                    parts[0].ParentGroup.areUpdatesSuspended = false;
                 }
             }
         }
@@ -1951,13 +1960,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 try
                 {
-                    parts[0].ParentGroup.areUpdatesSuspended = true;
                     foreach (SceneObjectPart part in parts)
                         SetTexture(part, texture, face);
                 }
                 finally
                 {
-                    parts[0].ParentGroup.areUpdatesSuspended = false;
                 }
             }
             ScriptSleep(200);
@@ -3340,7 +3347,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
 
             if (attachmentsModule != null)
-                return attachmentsModule.AttachObject(presence, grp, (uint)attachmentPoint, false, true);
+                return attachmentsModule.AttachObject(presence, grp, (uint)attachmentPoint, false, true, false);
             else
                 return false;
         }
@@ -3747,29 +3754,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             m_host.AddScriptLPS(1);
 
+            int implicitPerms = 0;
+
             if (m_host.ParentGroup.IsAttachment && (UUID)agent == m_host.ParentGroup.AttachedAvatar)
             {
                 // When attached, certain permissions are implicit if requested from owner
-                int implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS |
+                implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS |
                         ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
                         ScriptBaseClass.PERMISSION_CONTROL_CAMERA |
                         ScriptBaseClass.PERMISSION_TRACK_CAMERA |
                         ScriptBaseClass.PERMISSION_ATTACH;
 
-                if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
-                {
-                    m_host.TaskInventory.LockItemsForWrite(true);
-                    m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID;
-                    m_host.TaskInventory[m_item.ItemID].PermsMask = perm;
-                    m_host.TaskInventory.LockItemsForWrite(false);
-
-                    m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams(
-                            "run_time_permissions", new Object[] {
-                            new LSL_Integer(perm) },
-                            new DetectParams[0]));
-
-                    return;
-                }
             }
             else
             {
@@ -3790,26 +3785,31 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 if (sitting)
                 {
                     // When agent is sitting, certain permissions are implicit if requested from sitting agent
-                    int implicitPerms = ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
+                    implicitPerms = ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
                         ScriptBaseClass.PERMISSION_CONTROL_CAMERA |
                         ScriptBaseClass.PERMISSION_TRACK_CAMERA |
                         ScriptBaseClass.PERMISSION_TAKE_CONTROLS;
+                }
+                else
+                {
+                    if (World.GetExtraSetting("auto_grant_attach_perms") == "true")
+                        implicitPerms = ScriptBaseClass.PERMISSION_ATTACH;
+                }
+            }
 
-                    if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
-                    {
-                        m_host.TaskInventory.LockItemsForWrite(true);
-                        m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID;
-                        m_host.TaskInventory[m_item.ItemID].PermsMask = perm;
-                        m_host.TaskInventory.LockItemsForWrite(false);
+            if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
+            {
+                m_host.TaskInventory.LockItemsForWrite(true);
+                m_host.TaskInventory[m_item.ItemID].PermsGranter = agentID;
+                m_host.TaskInventory[m_item.ItemID].PermsMask = perm;
+                m_host.TaskInventory.LockItemsForWrite(false);
 
-                        m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams(
-                                "run_time_permissions", new Object[] {
-                                new LSL_Integer(perm) },
-                                new DetectParams[0]));
+                m_ScriptEngine.PostScriptEvent(m_item.ItemID, new EventParams(
+                        "run_time_permissions", new Object[] {
+                        new LSL_Integer(perm) },
+                        new DetectParams[0]));
 
-                        return;
-                    }
-                }
+                return;
             }
 
             ScenePresence presence = World.GetScenePresence(agentID);
@@ -3927,13 +3927,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 try
                 {
-                    parts[0].ParentGroup.areUpdatesSuspended = true;
                     foreach (SceneObjectPart part in parts)
                         part.SetFaceColor(new Vector3((float)color.x, (float)color.y, (float)color.z), face);
                 }
                 finally
                 {
-                    parts[0].ParentGroup.areUpdatesSuspended = false;
                 }
             }
         }
@@ -4051,7 +4049,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 {
                     try
                     {
-                        parts[0].ParentGroup.areUpdatesSuspended = true;
                         foreach (SceneObjectPart part in parts)
                         {
                             parentPrim.DelinkFromGroup(part.LocalId, true);
@@ -4059,7 +4056,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                     finally
                     {
-                        parts[0].ParentGroup.areUpdatesSuspended = false;
                     }
                 }
 
@@ -4074,7 +4070,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                     try
                     {
-                        parts[0].ParentGroup.areUpdatesSuspended = true;
                         foreach (SceneObjectPart part in parts)
                         {
                             part.ClearUpdateSchedule();
@@ -4083,7 +4078,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                     finally
                     {
-                        parts[0].ParentGroup.areUpdatesSuspended = false;
                     }                    
                     
                     
@@ -5369,12 +5363,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 return 0;
             }
+
+            // Vectors & Rotations always return zero in SL, but
+            //  keys don't always return zero, it seems to be a bit complex.
+            else if (src.Data[index] is LSL_Vector ||
+                    src.Data[index] is LSL_Rotation)
+            {
+                return 0;
+            }
             try
             {
+
                 if (src.Data[index] is LSL_Integer)
-                    return (LSL_Integer) src.Data[index];
+                    return (LSL_Integer)src.Data[index];
                 else if (src.Data[index] is LSL_Float)
-                    return Convert.ToInt32(((LSL_Float) src.Data[index]).value);
+                    return Convert.ToInt32(((LSL_Float)src.Data[index]).value);
                 return new LSL_Integer(src.Data[index].ToString());
             }
             catch (FormatException)
@@ -5394,12 +5397,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 return 0.0;
             }
+
+            // Vectors & Rotations always return zero in SL
+            else if (src.Data[index] is LSL_Vector ||
+                    src.Data[index] is LSL_Rotation)
+            {
+                return 0;
+            }
+            // valid keys seem to get parsed as integers then converted to floats
+            else
+            {
+                UUID uuidt;
+                if (src.Data[index] is LSL_Key && UUID.TryParse(src.Data[index].ToString(), out uuidt))
+                {
+                    return Convert.ToDouble(new LSL_Integer(src.Data[index].ToString()).value);
+                }
+            }
             try
             {
                 if (src.Data[index] is LSL_Integer)
-                    return Convert.ToDouble(((LSL_Integer) src.Data[index]).value);
+                    return Convert.ToDouble(((LSL_Integer)src.Data[index]).value);
                 else if (src.Data[index] is LSL_Float)
-                    return Convert.ToDouble(((LSL_Float) src.Data[index]).value);
+                    return Convert.ToDouble(((LSL_Float)src.Data[index]).value);
                 else if (src.Data[index] is LSL_String)
                 {
                     string str = ((LSL_String) src.Data[index]).m_string;
@@ -5437,17 +5456,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return src.Data[index].ToString();
         }
 
-        public LSL_String llList2Key(LSL_List src, int index)
+        public LSL_Key llList2Key(LSL_List src, int index)
         {
             m_host.AddScriptLPS(1);
             if (index < 0)
             {
                 index = src.Length + index;
             }
+
             if (index >= src.Length || index < 0)
             {
                 return "";
             }
+
+            // SL spits out an empty string for types other than key & string
+            // At the time of patching, LSL_Key is currently LSL_String,
+            // so the OR check may be a little redundant, but it's being done
+            // for completion and should LSL_Key ever be implemented 
+            // as it's own struct
+            else if (!(src.Data[index] is LSL_String ||
+                    src.Data[index] is LSL_Key))
+            {
+                return "";
+            }
+
             return src.Data[index].ToString();
         }
 
@@ -5466,6 +5498,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 return (LSL_Vector)src.Data[index];
             }
+
+            // SL spits always out ZERO_VECTOR for anything other than
+            // strings or vectors. Although keys always return ZERO_VECTOR,
+            // it is currently difficult to make the distinction between
+            // a string, a key as string and a string that by coincidence
+            // is a string, so we're going to leave that up to the
+            // LSL_Vector constructor.
+            else if (!(src.Data[index] is LSL_String ||
+                    src.Data[index] is LSL_Vector))
+            {
+                return new LSL_Vector(0, 0, 0);
+            }
             else
             {
                 return new LSL_Vector(src.Data[index].ToString());
@@ -5483,7 +5527,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 return new LSL_Rotation(0, 0, 0, 1);
             }
-            if (src.Data[index].GetType() == typeof(LSL_Rotation))
+
+            // SL spits always out ZERO_ROTATION for anything other than
+            // strings or vectors. Although keys always return ZERO_ROTATION,
+            // it is currently difficult to make the distinction between
+            // a string, a key as string and a string that by coincidence
+            // is a string, so we're going to leave that up to the
+            // LSL_Rotation constructor.
+            else if (!(src.Data[index] is LSL_String ||
+                    src.Data[index] is LSL_Rotation))
+            {
+                return new LSL_Rotation(0, 0, 0, 1);
+            }
+            else if (src.Data[index].GetType() == typeof(LSL_Rotation))
             {
                 return (LSL_Rotation)src.Data[index];
             }
@@ -6236,7 +6292,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 try
                 {
-                    parts[0].ParentGroup.areUpdatesSuspended = true;
                     foreach (var part in parts)
                     {
                         SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate);
@@ -6244,7 +6299,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 }
                 finally
                 {
-                    parts[0].ParentGroup.areUpdatesSuspended = false;
                 }
             }
         }
@@ -7689,7 +7743,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llSetPrimitiveParams(LSL_List rules)
         {
             m_host.AddScriptLPS(1);
-            SetPrimParams(m_host, rules);
+
+            setLinkPrimParams(ScriptBaseClass.LINK_THIS, rules);
 
             ScriptSleep(200);
         }
@@ -7703,26 +7758,47 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         private void setLinkPrimParams(int linknumber, LSL_List rules)
         {
-            List<SceneObjectPart> parts = GetLinkParts(linknumber);
+            List<object> parts = new List<object>();
+            List<SceneObjectPart> prims = GetLinkParts(linknumber);
             List<ScenePresence> avatars = GetLinkAvatars(linknumber);
-            if (parts.Count>0)
+            foreach (SceneObjectPart p in prims)
+                parts.Add(p);
+            foreach (ScenePresence p in avatars)
+                parts.Add(p);
+
+            LSL_List remaining = null;
+
+            if (parts.Count > 0)
             {
-                try
+                foreach (object part in parts)
                 {
-                    parts[0].ParentGroup.areUpdatesSuspended = true;
-                    foreach (SceneObjectPart part in parts)
-                        SetPrimParams(part, rules);
+                    if (part is SceneObjectPart)
+                        remaining = SetPrimParams((SceneObjectPart)part, rules);
+                    else
+                        remaining = SetPrimParams((ScenePresence)part, rules);
                 }
-                finally
+
+                while((object)remaining != null && remaining.Length > 2)
                 {
-                    parts[0].ParentGroup.areUpdatesSuspended = false;
+                    linknumber = remaining.GetLSLIntegerItem(0);
+                    rules = remaining.GetSublist(1,-1);
+                    parts.Clear();
+                    prims = GetLinkParts(linknumber);
+                    avatars = GetLinkAvatars(linknumber);
+                    foreach (SceneObjectPart p in prims)
+                        parts.Add(p);
+                    foreach (ScenePresence p in avatars)
+                        parts.Add(p);
+
+                    foreach (object part in parts)
+                    {
+                        if (part is SceneObjectPart)
+                            remaining = SetPrimParams((SceneObjectPart)part, rules);
+                        else
+                            remaining = SetPrimParams((ScenePresence)part, rules);
+                    }
                 }
             }
-            if (avatars.Count > 0)
-            {
-                foreach (ScenePresence avatar in avatars)
-                    SetPrimParams(avatar, rules);
-            }
         }
 
         private void SetPhysicsMaterial(SceneObjectPart part, int material_bits,
@@ -7784,7 +7860,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return new Vector3((float)x, (float)y, (float)z);
         }
 
-        protected void SetPrimParams(ScenePresence av, LSL_List rules)
+        protected LSL_List SetPrimParams(ScenePresence av, LSL_List rules)
         {
             //This is a special version of SetPrimParams to deal with avatars which are sat on the linkset.
 
@@ -7807,7 +7883,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         case (int)ScriptBaseClass.PRIM_POS_LOCAL:
                             {
                                 if (remain < 1)
-                                    return;
+                                    return null;
 
                                 LSL_Vector v;
                                 v = rules.GetVector3Item(idx++);
@@ -7841,7 +7917,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         case (int)ScriptBaseClass.PRIM_ROTATION:
                             {
                                 if (remain < 1)
-                                    return;
+                                    return null;
 
                                 LSL_Rotation r;
                                 r = rules.GetQuaternionItem(idx++);
@@ -7872,7 +7948,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         case (int)ScriptBaseClass.PRIM_NAME:
                         case (int)ScriptBaseClass.PRIM_DESC:
                             if (remain < 1)
-                                return;
+                                return null;
                             idx++;
                             break;
 
@@ -7880,13 +7956,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
                         case (int)ScriptBaseClass.PRIM_TEXGEN:
                             if (remain < 2)
-                                return;
+                                return null;
                             idx += 2;
                             break;
 
                         case (int)ScriptBaseClass.PRIM_TYPE:
                             if (remain < 3)
-                                return;
+                                return null;
                             code = (int)rules.GetLSLIntegerItem(idx++);
                             remain = rules.Length - idx;
                             switch (code)
@@ -7895,13 +7971,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 case (int)ScriptBaseClass.PRIM_TYPE_CYLINDER:
                                 case (int)ScriptBaseClass.PRIM_TYPE_PRISM:
                                     if (remain < 6)
-                                        return;
+                                        return null;
                                     idx += 6;
                                     break;
 
                                 case (int)ScriptBaseClass.PRIM_TYPE_SPHERE:
                                     if (remain < 5)
-                                        return;
+                                        return null;
                                     idx += 5;
                                     break;
 
@@ -7909,13 +7985,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 case (int)ScriptBaseClass.PRIM_TYPE_TUBE:
                                 case (int)ScriptBaseClass.PRIM_TYPE_RING:
                                     if (remain < 11)
-                                        return;
+                                        return null;
                                     idx += 11;
                                     break;
 
                                 case (int)ScriptBaseClass.PRIM_TYPE_SCULPT:
                                     if (remain < 2)
-                                        return;
+                                        return null;
                                     idx += 2;
                                     break;
                             }
@@ -7926,7 +8002,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
                         case (int)ScriptBaseClass.PRIM_OMEGA:
                             if (remain < 3)
-                                return;
+                                return null;
                             idx += 3;
                             break;
 
@@ -7934,33 +8010,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
                         case (int)ScriptBaseClass.PRIM_PHYSICS_MATERIAL:
                             if (remain < 5)
-                                return;
+                                return null;
                             idx += 5;
                             break;
 
                         case (int)ScriptBaseClass.PRIM_FLEXIBLE:
                             if (remain < 7)
-                                return;
+                                return null;
 
                             idx += 7;
                             break;
 
                         case (int)ScriptBaseClass.PRIM_LINK_TARGET:
                             if (remain < 3) // setting to 3 on the basis that parsing any usage of PRIM_LINK_TARGET that has nothing following it is pointless.
-                                return;
+                                return null;
 
-                            if (positionChanged)
-                            {
-                                positionChanged = false;
-                                av.OffsetPosition = finalPos;
-//                                av.SendAvatarDataToAllAgents();
-                                av.SendTerseUpdateToAllClients();
-                            }
-
-                            LSL_Integer new_linknumber = rules.GetLSLIntegerItem(idx++);
-                            LSL_List new_rules = rules.GetSublist(idx, -1);
-                            setLinkPrimParams((int)new_linknumber, new_rules);
-                            return;
+                            return rules.GetSublist(idx, -1);
                     }
                 }
             }
@@ -7975,12 +8040,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     positionChanged = false;
                 }
             }
+            return null;
         }
 
-        protected void SetPrimParams(SceneObjectPart part, LSL_List rules)
+        protected LSL_List SetPrimParams(SceneObjectPart part, LSL_List rules)
         {
             if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
-                return;
+                return null;
 
             int idx = 0;
 
@@ -8005,7 +8071,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         case (int)ScriptBaseClass.PRIM_POSITION:
                         case (int)ScriptBaseClass.PRIM_POS_LOCAL:
                             if (remain < 1)
-                                return;
+                                return null;
 
                             v=rules.GetVector3Item(idx++);
                             currentPosition = GetSetPosTarget(part, v, currentPosition);
@@ -8014,7 +8080,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             break;
                         case (int)ScriptBaseClass.PRIM_SIZE:
                             if (remain < 1)
-                                return;
+                                return null;
 
                             v=rules.GetVector3Item(idx++);
                             SetScale(part, v);
@@ -8022,7 +8088,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             break;
                         case (int)ScriptBaseClass.PRIM_ROTATION:
                             if (remain < 1)
-                                return;
+                                return null;
 
                             LSL_Rotation q = rules.GetQuaternionItem(idx++);
                             SceneObjectPart rootPart = parentgrp.RootPart;
@@ -8043,7 +8109,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                         case (int)ScriptBaseClass.PRIM_TYPE:
                             if (remain < 3)
-                                return;
+                                return null;
 
                             code = (int)rules.GetLSLIntegerItem(idx++);
 
@@ -8062,7 +8128,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             {
                                 case (int)ScriptBaseClass.PRIM_TYPE_BOX:
                                     if (remain < 6)
-                                        return;
+                                        return null;
 
                                     face = (int)rules.GetLSLIntegerItem(idx++);
                                     v = rules.GetVector3Item(idx++); // cut
@@ -8077,7 +8143,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                                 case (int)ScriptBaseClass.PRIM_TYPE_CYLINDER:
                                     if (remain < 6)
-                                        return;
+                                        return null;
 
                                     face = (int)rules.GetLSLIntegerItem(idx++); // holeshape
                                     v = rules.GetVector3Item(idx++); // cut
@@ -8091,7 +8157,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                                 case (int)ScriptBaseClass.PRIM_TYPE_PRISM:
                                     if (remain < 6)
-                                        return;
+                                        return null;
 
                                     face = (int)rules.GetLSLIntegerItem(idx++); // holeshape
                                     v = rules.GetVector3Item(idx++); //cut
@@ -8105,7 +8171,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                                 case (int)ScriptBaseClass.PRIM_TYPE_SPHERE:
                                     if (remain < 5)
-                                        return;
+                                        return null;
 
                                     face = (int)rules.GetLSLIntegerItem(idx++); // holeshape
                                     v = rules.GetVector3Item(idx++); // cut
@@ -8118,7 +8184,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                                 case (int)ScriptBaseClass.PRIM_TYPE_TORUS:
                                     if (remain < 11)
-                                        return;
+                                        return null;
 
                                     face = (int)rules.GetLSLIntegerItem(idx++); // holeshape
                                     v = rules.GetVector3Item(idx++); //cut
@@ -8137,7 +8203,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                                 case (int)ScriptBaseClass.PRIM_TYPE_TUBE:
                                     if (remain < 11)
-                                        return;
+                                        return null;
 
                                     face = (int)rules.GetLSLIntegerItem(idx++); // holeshape
                                     v = rules.GetVector3Item(idx++); //cut
@@ -8156,7 +8222,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                                 case (int)ScriptBaseClass.PRIM_TYPE_RING:
                                     if (remain < 11)
-                                        return;
+                                        return null;
 
                                     face = (int)rules.GetLSLIntegerItem(idx++); // holeshape
                                     v = rules.GetVector3Item(idx++); //cut
@@ -8175,7 +8241,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                                 case (int)ScriptBaseClass.PRIM_TYPE_SCULPT:
                                     if (remain < 2)
-                                        return;
+                                        return null;
 
                                     string map = rules.Data[idx++].ToString();
                                     face = (int)rules.GetLSLIntegerItem(idx++); // type
@@ -8187,7 +8253,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                         case (int)ScriptBaseClass.PRIM_TEXTURE:
                             if (remain < 5)
-                                return;
+                                return null;
 
                             face=(int)rules.GetLSLIntegerItem(idx++);
                             string tex=rules.Data[idx++].ToString();
@@ -8204,7 +8270,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                         case (int)ScriptBaseClass.PRIM_COLOR:
                             if (remain < 3)
-                                return;
+                                return null;
 
                             face=(int)rules.GetLSLIntegerItem(idx++);
                             LSL_Vector color=rules.GetVector3Item(idx++);
@@ -8217,7 +8283,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                         case (int)ScriptBaseClass.PRIM_FLEXIBLE:
                             if (remain < 7)
-                                return;
+                                return null;
 
                             bool flexi = rules.GetLSLIntegerItem(idx++);
                             int softness = rules.GetLSLIntegerItem(idx++);
@@ -8233,7 +8299,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                         case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
                             if (remain < 5)
-                                return;
+                                return null;
                             bool light = rules.GetLSLIntegerItem(idx++);
                             LSL_Vector lightcolor = rules.GetVector3Item(idx++);
                             float intensity = (float)rules.GetLSLFloatItem(idx++);
@@ -8246,7 +8312,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                         case (int)ScriptBaseClass.PRIM_GLOW:
                             if (remain < 2)
-                                return;
+                                return null;
                             face = rules.GetLSLIntegerItem(idx++);
                             float glow = (float)rules.GetLSLFloatItem(idx++);
 
@@ -8256,7 +8322,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                         case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
                             if (remain < 3)
-                                return;
+                                return null;
                             face = (int)rules.GetLSLIntegerItem(idx++);
                             int shiny = (int)rules.GetLSLIntegerItem(idx++);
                             Bumpiness bump = (Bumpiness)(int)rules.GetLSLIntegerItem(idx++);
@@ -8267,7 +8333,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                          case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
                              if (remain < 2)
-                                 return;
+                                 return null;
                              face = rules.GetLSLIntegerItem(idx++);
                              bool st = rules.GetLSLIntegerItem(idx++);
                              SetFullBright(part, face , st);
@@ -8275,17 +8341,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                          case (int)ScriptBaseClass.PRIM_MATERIAL:
                              if (remain < 1)
-                                 return;
+                                 return null;
                              int mat = rules.GetLSLIntegerItem(idx++);
                              if (mat < 0 || mat > 7)
-                                 return;
+                                 return null;
 
                              part.Material = Convert.ToByte(mat);
                              break;
 
                          case (int)ScriptBaseClass.PRIM_PHANTOM:
                              if (remain < 1)
-                                 return;
+                                 return null;
 
                              string ph = rules.Data[idx++].ToString();
                              parentgrp.ScriptSetPhantomStatus(ph.Equals("1"));
@@ -8294,7 +8360,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                          case (int)ScriptBaseClass.PRIM_PHYSICS:
                             if (remain < 1)
-                                 return;
+                                 return null;
                              string phy = rules.Data[idx++].ToString();
                              bool physics;
 
@@ -8308,7 +8374,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                         case (int)ScriptBaseClass.PRIM_PHYSICS_SHAPE_TYPE:
                             if (remain < 1)
-                                return;
+                                return null;
 
                             int shape_type = rules.GetLSLIntegerItem(idx++);
 
@@ -8324,7 +8390,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                         case (int)ScriptBaseClass.PRIM_PHYSICS_MATERIAL:
                             if (remain < 5)
-                                return;
+                                return null;
 
                             int material_bits = rules.GetLSLIntegerItem(idx++);
                             float material_density = (float)rules.GetLSLFloatItem(idx++);
@@ -8338,7 +8404,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                         case (int)ScriptBaseClass.PRIM_TEMP_ON_REZ:
                             if (remain < 1)
-                                return;
+                                return null;
                             string temp = rules.Data[idx++].ToString();
 
                             parentgrp.ScriptSetTemporaryStatus(temp.Equals("1"));
@@ -8347,7 +8413,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                         case (int)ScriptBaseClass.PRIM_TEXGEN:
                             if (remain < 2)
-                                return;
+                                return null;
                                 //face,type
                             face = rules.GetLSLIntegerItem(idx++);
                             int style = rules.GetLSLIntegerItem(idx++);
@@ -8355,7 +8421,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             break;
                         case (int)ScriptBaseClass.PRIM_TEXT:
                             if (remain < 3)
-                                return;
+                                return null;
                             string primText = rules.GetLSLStringItem(idx++);
                             LSL_Vector primTextColor = rules.GetVector3Item(idx++);
                             LSL_Float primTextAlpha = rules.GetLSLFloatItem(idx++);
@@ -8367,26 +8433,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             break;
                         case (int)ScriptBaseClass.PRIM_NAME:
                             if (remain < 1)
-                                return;
+                                return null;
                             string primName = rules.GetLSLStringItem(idx++);
                             part.Name = primName;
                             break;
                         case (int)ScriptBaseClass.PRIM_DESC:
                             if (remain < 1)
-                                return;
+                                return null;
                             string primDesc = rules.GetLSLStringItem(idx++);
                             part.Description = primDesc;
                             break;
                         case (int)ScriptBaseClass.PRIM_ROT_LOCAL:
                             if (remain < 1)
-                                return;
-
+                                return null;
                             LSL_Rotation lr = rules.GetQuaternionItem(idx++);
                             SetRot(part, Rot2Quaternion(lr));
                             break;
                         case (int)ScriptBaseClass.PRIM_OMEGA:
                             if (remain < 3)
-                                return;
+                                return null;
                             LSL_Vector axis = rules.GetVector3Item(idx++);
                             LSL_Float spinrate = rules.GetLSLFloatItem(idx++);
                             LSL_Float gain = rules.GetLSLFloatItem(idx++);
@@ -8395,35 +8460,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                         case (int)ScriptBaseClass.PRIM_LINK_TARGET:
                             if (remain < 3) // setting to 3 on the basis that parsing any usage of PRIM_LINK_TARGET that has nothing following it is pointless.
-                                return;
-
-                            // do a pending position change before jumping to other part/avatar
-                            if (positionChanged)
-                            {
-                                positionChanged = false;
-                                if (parentgrp == null)
-                                    return;
+                                return null;
 
-                                if (parentgrp.RootPart == part)
-                                {
-
-                                    Util.FireAndForget(delegate(object x)
-                                    {
-                                        parentgrp.UpdateGroupPosition(new Vector3((float)currentPosition.x, (float)currentPosition.y, (float)currentPosition.z));
-                                    });
-                                }
-                                else
-                                {
-                                    part.OffsetPosition = new Vector3((float)currentPosition.x, (float)currentPosition.y, (float)currentPosition.z);
-                                    parentgrp.HasGroupChanged = true;
-                                    parentgrp.ScheduleGroupForTerseUpdate();
-                                }
-                            }
-
-                            LSL_Integer new_linknumber = rules.GetLSLIntegerItem(idx++);
-                            LSL_List new_rules = rules.GetSublist(idx, -1);
-                            setLinkPrimParams((int)new_linknumber, new_rules);
-                            return;
+                            return rules.GetSublist(idx, -1);
                     }
                 }
             }
@@ -8447,6 +8486,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     }
                 }
             }
+            return null;
         }
 
         public LSL_String llStringToBase64(string str)
@@ -12082,7 +12122,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (obj.OwnerID != m_host.OwnerID)
                 return;
 
-            SetPrimParams(obj, rules);
+            LSL_List remaining = SetPrimParams(obj, rules);
+
+            while ((object)remaining != null && remaining.Length > 2)
+            {
+                LSL_Integer newLink = remaining.GetLSLIntegerItem(0);
+                LSL_List newrules = remaining.GetSublist(1, -1);
+                foreach(SceneObjectPart part in GetLinkParts(obj, newLink)){
+                    remaining = SetPrimParams(part, newrules);
+                }
+            }
         }
 
         public LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules)