aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
diff options
context:
space:
mode:
authorMelanie2012-08-25 18:19:51 +0100
committerMelanie2012-08-25 18:19:51 +0100
commit1eb1c1bd4bc972e2df301b9dafb40fbb2f37b40c (patch)
treeb55dd23e7f33b2c839abfa6d1dd1af5153325fe3 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
parentMerge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminster (diff)
downloadopensim-SC_OLD-1eb1c1bd4bc972e2df301b9dafb40fbb2f37b40c.zip
opensim-SC_OLD-1eb1c1bd4bc972e2df301b9dafb40fbb2f37b40c.tar.gz
opensim-SC_OLD-1eb1c1bd4bc972e2df301b9dafb40fbb2f37b40c.tar.bz2
opensim-SC_OLD-1eb1c1bd4bc972e2df301b9dafb40fbb2f37b40c.tar.xz
renaming to be similar to equivalent Set command
Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs4
1 files changed, 2 insertions, 2 deletions
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)