diff options
author | Melanie | 2012-02-03 00:07:23 +0000 |
---|---|---|
committer | Melanie | 2012-02-03 00:07:23 +0000 |
commit | 76a658324cb2752e050c5593761e270d26c5a5e4 (patch) | |
tree | 1baaab8273ad8f2b68860b464067ee773031a96e /OpenSim/Region | |
parent | Fix test failure (diff) | |
parent | D'oh - we want to call llGetLinkNumberOfSides() in the LSL_Stub, not llGetLin... (diff) | |
download | opensim-SC_OLD-76a658324cb2752e050c5593761e270d26c5a5e4.zip opensim-SC_OLD-76a658324cb2752e050c5593761e270d26c5a5e4.tar.gz opensim-SC_OLD-76a658324cb2752e050c5593761e270d26c5a5e4.tar.bz2 opensim-SC_OLD-76a658324cb2752e050c5593761e270d26c5a5e4.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs index b66537f..6106a65 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | |||
@@ -138,7 +138,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
138 | LSL_Key llGetLinkKey(int linknum); | 138 | LSL_Key llGetLinkKey(int linknum); |
139 | LSL_String llGetLinkName(int linknum); | 139 | LSL_String llGetLinkName(int linknum); |
140 | LSL_Integer llGetLinkNumber(); | 140 | LSL_Integer llGetLinkNumber(); |
141 | LSL_List llGetLinkPrimitiveParams(int linknum, LSL_List rules); | 141 | LSL_Integer llGetLinkNumberOfSides(int link); |
142 | LSL_List llGetLinkPrimitiveParams(int linknum, LSL_List rules); | ||
142 | LSL_Integer llGetListEntryType(LSL_List src, int index); | 143 | LSL_Integer llGetListEntryType(LSL_List src, int index); |
143 | LSL_Integer llGetListLength(LSL_List src); | 144 | LSL_Integer llGetListLength(LSL_List src); |
144 | LSL_Vector llGetLocalPos(); | 145 | LSL_Vector llGetLocalPos(); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs index 840d3a4..83550a5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |||
@@ -539,6 +539,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
539 | return m_LSL_Functions.llGetLinkNumber(); | 539 | return m_LSL_Functions.llGetLinkNumber(); |
540 | } | 540 | } |
541 | 541 | ||
542 | public LSL_Integer llGetLinkNumberOfSides(int link) | ||
543 | { | ||
544 | return m_LSL_Functions.llGetLinkNumberOfSides(link); | ||
545 | } | ||
546 | |||
542 | public LSL_Integer llGetListEntryType(LSL_List src, int index) | 547 | public LSL_Integer llGetListEntryType(LSL_List src, int index) |
543 | { | 548 | { |
544 | return m_LSL_Functions.llGetListEntryType(src, index); | 549 | return m_LSL_Functions.llGetListEntryType(src, index); |