2 files changed, 9 insertions, 35 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index b8a214a..50691a5 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -5286,30 +5286,17 @@ namespace OpenSim.Region.ScriptEngine.Common
 
         public void llSetPrimitiveParams(LSL_Types.list rules)
         {
-            llSetLinkPrimitiveParams(m_host.LinkNum+1, rules);
+            llSetLinkPrimitiveParams(m_host.LinkNum, rules);
         }
 
         public void llSetLinkPrimitiveParams(int linknumber, LSL_Types.list rules)
         {
             m_host.AddScriptLPS(1);
 
-            SceneObjectPart part=null;
+                        if(m_host.ParentGroup == null)
+                                return;
 
-            if (m_host.LinkNum+1 != linknumber)
-            {
-                foreach (SceneObjectPart partInst in m_host.ParentGroup.GetParts())
-                {
-                    if ((partInst.LinkNum) == linknumber)
-                    {
-                        part = partInst;
-                        break;
-                    }
-                }
-            }
-            else
-            {
-                part = m_host;
-            }
+            SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknumber);
 
             if (part == null)
                 return;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index c7a7581..a747586 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5085,30 +5085,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public void llSetPrimitiveParams(LSL_Types.list rules)
         {
-            llSetLinkPrimitiveParams(m_host.LinkNum+1, rules);
+            llSetLinkPrimitiveParams(m_host.LinkNum, rules);
         }
 
         public void llSetLinkPrimitiveParams(int linknumber, LSL_Types.list rules)
         {
             m_host.AddScriptLPS(1);
+                        
+                        if(m_host.ParentGroup == null)
+                                return;
 
-            SceneObjectPart part=null;
-
-            if (m_host.LinkNum+1 != linknumber)
-            {
-                foreach (SceneObjectPart partInst in m_host.ParentGroup.GetParts())
-                {
-                    if ((partInst.LinkNum) == linknumber)
-                    {
-                        part = partInst;
-                        break;
-                    }
-                }
-            }
-            else
-            {
-                part = m_host;
-            }
+            SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknumber);
 
             if (part == null)
                 return;