aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Interface
diff options
context:
space:
mode:
authorMelanie2012-02-03 00:09:05 +0000
committerMelanie2012-02-03 00:09:05 +0000
commitbce5dfe711da5979746a0f403bea1ebc32058fef (patch)
tree0e6ea513794fc80ffac6528085b18e29be5ce8b9 /OpenSim/Region/ScriptEngine/Shared/Api/Interface
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-bce5dfe711da5979746a0f403bea1ebc32058fef.zip
opensim-SC_OLD-bce5dfe711da5979746a0f403bea1ebc32058fef.tar.gz
opensim-SC_OLD-bce5dfe711da5979746a0f403bea1ebc32058fef.tar.bz2
opensim-SC_OLD-bce5dfe711da5979746a0f403bea1ebc32058fef.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs3
1 files changed, 2 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 73131e6..f2d4399 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -139,7 +139,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
139 LSL_Key llGetLinkKey(int linknum); 139 LSL_Key llGetLinkKey(int linknum);
140 LSL_String llGetLinkName(int linknum); 140 LSL_String llGetLinkName(int linknum);
141 LSL_Integer llGetLinkNumber(); 141 LSL_Integer llGetLinkNumber();
142 LSL_List llGetLinkPrimitiveParams(int linknum, LSL_List rules); 142 LSL_Integer llGetLinkNumberOfSides(int link);
143 LSL_List llGetLinkPrimitiveParams(int linknum, LSL_List rules);
143 LSL_Integer llGetListEntryType(LSL_List src, int index); 144 LSL_Integer llGetListEntryType(LSL_List src, int index);
144 LSL_Integer llGetListLength(LSL_List src); 145 LSL_Integer llGetListLength(LSL_List src);
145 LSL_Vector llGetLocalPos(); 146 LSL_Vector llGetLocalPos();