aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs14
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs4
2 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 5386a28..c8b6a7e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8821,7 +8821,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8821 public LSL_List llGetPrimitiveParams(LSL_List rules) 8821 public LSL_List llGetPrimitiveParams(LSL_List rules)
8822 { 8822 {
8823 m_host.AddScriptLPS(1); 8823 m_host.AddScriptLPS(1);
8824 return GetLinkPrimitiveParams(m_host, rules); 8824 return GetPrimParams(m_host, rules);
8825 } 8825 }
8826 8826
8827 public LSL_List llGetLinkPrimitiveParams(int linknumber, LSL_List rules) 8827 public LSL_List llGetLinkPrimitiveParams(int linknumber, LSL_List rules)
@@ -8840,7 +8840,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8840 { 8840 {
8841 foreach (var part in parts) 8841 foreach (var part in parts)
8842 { 8842 {
8843 LSL_List partRes = GetLinkPrimitiveParams(part, rules); 8843 LSL_List partRes = GetPrimParams(part, rules);
8844 res += partRes; 8844 res += partRes;
8845 } 8845 }
8846 } 8846 }
@@ -8848,14 +8848,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8848 { 8848 {
8849 foreach (ScenePresence avatar in avatars) 8849 foreach (ScenePresence avatar in avatars)
8850 { 8850 {
8851 LSL_List avaRes = GetLinkPrimitiveParams(avatar, rules); 8851 LSL_List avaRes = GetPrimParams(avatar, rules);
8852 res += avaRes; 8852 res += avaRes;
8853 } 8853 }
8854 } 8854 }
8855 return res; 8855 return res;
8856 } 8856 }
8857 8857
8858 public LSL_List GetLinkPrimitiveParams(ScenePresence avatar, LSL_List rules) 8858 public LSL_List GetPrimParams(ScenePresence avatar, LSL_List rules)
8859 { 8859 {
8860 // avatars case 8860 // avatars case
8861 // replies as SL wiki 8861 // replies as SL wiki
@@ -9116,7 +9116,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9116 return res; 9116 return res;
9117 } 9117 }
9118 9118
9119 public LSL_List GetLinkPrimitiveParams(SceneObjectPart part, LSL_List rules) 9119 public LSL_List GetPrimParams(SceneObjectPart part, LSL_List rules)
9120 { 9120 {
9121 LSL_List res = new LSL_List(); 9121 LSL_List res = new LSL_List();
9122 int idx=0; 9122 int idx=0;
@@ -12104,7 +12104,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12104 } 12104 }
12105 } 12105 }
12106 12106
12107 public LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules) 12107 public LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules)
12108 { 12108 {
12109 SceneObjectPart obj = World.GetSceneObjectPart(new UUID(prim)); 12109 SceneObjectPart obj = World.GetSceneObjectPart(new UUID(prim));
12110 if (obj == null) 12110 if (obj == null)
@@ -12113,7 +12113,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12113 if (obj.OwnerID != m_host.OwnerID) 12113 if (obj.OwnerID != m_host.OwnerID)
12114 return new LSL_List(); 12114 return new LSL_List();
12115 12115
12116 return GetLinkPrimitiveParams(obj, rules); 12116 return GetPrimParams(obj, rules);
12117 } 12117 }
12118 12118
12119 public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link) 12119 public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index a81c39c..7b71a24 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2261,7 +2261,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2261 List<SceneObjectPart> parts = ((LSL_Api)m_LSL_Api).GetLinkParts(linknumber); 2261 List<SceneObjectPart> parts = ((LSL_Api)m_LSL_Api).GetLinkParts(linknumber);
2262 foreach (SceneObjectPart part in parts) 2262 foreach (SceneObjectPart part in parts)
2263 { 2263 {
2264 retVal += ((LSL_Api)m_LSL_Api).GetLinkPrimitiveParams(part, rules); 2264 retVal += ((LSL_Api)m_LSL_Api).GetPrimParams(part, rules);
2265 } 2265 }
2266 return retVal; 2266 return retVal;
2267 } 2267 }
@@ -3013,7 +3013,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3013 m_host.AddScriptLPS(1); 3013 m_host.AddScriptLPS(1);
3014 InitLSL(); 3014 InitLSL();
3015 3015
3016 return m_LSL_Api.GetLinkPrimitiveParamsEx(prim, rules); 3016 return m_LSL_Api.GetPrimitiveParamsEx(prim, rules);
3017 } 3017 }
3018 3018
3019 public void osSetPrimitiveParams(LSL_Key prim, LSL_List rules) 3019 public void osSetPrimitiveParams(LSL_Key prim, LSL_List rules)