diff options
author | SignpostMarv | 2012-08-24 16:35:59 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-08-25 02:30:23 +0100 |
commit | 3d504261b0e189f8111912a3fff9d45579c04eed (patch) | |
tree | 2fce508c8b3e00ee3f125998e1ef1b5cf8375ca2 /OpenSim/Region | |
parent | Following on from f8a89a79, do not allow more than one 'type' folder (e.g. ca... (diff) | |
download | opensim-SC_OLD-3d504261b0e189f8111912a3fff9d45579c04eed.zip opensim-SC_OLD-3d504261b0e189f8111912a3fff9d45579c04eed.tar.gz opensim-SC_OLD-3d504261b0e189f8111912a3fff9d45579c04eed.tar.bz2 opensim-SC_OLD-3d504261b0e189f8111912a3fff9d45579c04eed.tar.xz |
renaming to be similar to equivalent Set command
Diffstat (limited to 'OpenSim/Region')
3 files changed, 8 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 2bfb9b3..c706f48 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -7910,7 +7910,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7910 | public LSL_List llGetPrimitiveParams(LSL_List rules) | 7910 | public LSL_List llGetPrimitiveParams(LSL_List rules) |
7911 | { | 7911 | { |
7912 | m_host.AddScriptLPS(1); | 7912 | m_host.AddScriptLPS(1); |
7913 | return GetLinkPrimitiveParams(m_host, rules); | 7913 | return GetPrimParams(m_host, rules); |
7914 | } | 7914 | } |
7915 | 7915 | ||
7916 | public LSL_List llGetLinkPrimitiveParams(int linknumber, LSL_List rules) | 7916 | public LSL_List llGetLinkPrimitiveParams(int linknumber, LSL_List rules) |
@@ -7923,14 +7923,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7923 | 7923 | ||
7924 | foreach (var part in parts) | 7924 | foreach (var part in parts) |
7925 | { | 7925 | { |
7926 | LSL_List partRes = GetLinkPrimitiveParams(part, rules); | 7926 | LSL_List partRes = GetPrimParams(part, rules); |
7927 | res += partRes; | 7927 | res += partRes; |
7928 | } | 7928 | } |
7929 | 7929 | ||
7930 | return res; | 7930 | return res; |
7931 | } | 7931 | } |
7932 | 7932 | ||
7933 | public LSL_List GetLinkPrimitiveParams(SceneObjectPart part, LSL_List rules) | 7933 | public LSL_List GetPrimParams(SceneObjectPart part, LSL_List rules) |
7934 | { | 7934 | { |
7935 | LSL_List res = new LSL_List(); | 7935 | LSL_List res = new LSL_List(); |
7936 | int idx=0; | 7936 | int idx=0; |
@@ -10752,7 +10752,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10752 | } | 10752 | } |
10753 | } | 10753 | } |
10754 | 10754 | ||
10755 | public LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules) | 10755 | public LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules) |
10756 | { | 10756 | { |
10757 | SceneObjectPart obj = World.GetSceneObjectPart(new UUID(prim)); | 10757 | SceneObjectPart obj = World.GetSceneObjectPart(new UUID(prim)); |
10758 | if (obj == null) | 10758 | if (obj == null) |
@@ -10761,7 +10761,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10761 | if (obj.OwnerID != m_host.OwnerID) | 10761 | if (obj.OwnerID != m_host.OwnerID) |
10762 | return new LSL_List(); | 10762 | return new LSL_List(); |
10763 | 10763 | ||
10764 | return GetLinkPrimitiveParams(obj, rules); | 10764 | return GetPrimParams(obj, rules); |
10765 | } | 10765 | } |
10766 | 10766 | ||
10767 | public void print(string str) | 10767 | public void print(string str) |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 5e7c2d9..c277708 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -2250,7 +2250,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2250 | List<SceneObjectPart> parts = ((LSL_Api)m_LSL_Api).GetLinkParts(linknumber); | 2250 | List<SceneObjectPart> parts = ((LSL_Api)m_LSL_Api).GetLinkParts(linknumber); |
2251 | foreach (SceneObjectPart part in parts) | 2251 | foreach (SceneObjectPart part in parts) |
2252 | { | 2252 | { |
2253 | retVal += ((LSL_Api)m_LSL_Api).GetLinkPrimitiveParams(part, rules); | 2253 | retVal += ((LSL_Api)m_LSL_Api).GetPrimParams(part, rules); |
2254 | } | 2254 | } |
2255 | return retVal; | 2255 | return retVal; |
2256 | } | 2256 | } |
@@ -2965,7 +2965,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2965 | m_host.AddScriptLPS(1); | 2965 | m_host.AddScriptLPS(1); |
2966 | InitLSL(); | 2966 | InitLSL(); |
2967 | 2967 | ||
2968 | return m_LSL_Api.GetLinkPrimitiveParamsEx(prim, rules); | 2968 | return m_LSL_Api.GetPrimitiveParamsEx(prim, rules); |
2969 | } | 2969 | } |
2970 | 2970 | ||
2971 | public void osSetPrimitiveParams(LSL_Key prim, LSL_List rules) | 2971 | public void osSetPrimitiveParams(LSL_Key prim, LSL_List rules) |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs index 3fb463b..cd58614 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | |||
@@ -425,6 +425,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
425 | void print(string str); | 425 | void print(string str); |
426 | 426 | ||
427 | void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules); | 427 | void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules); |
428 | LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules); | 428 | LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules); |
429 | } | 429 | } |
430 | } | 430 | } |