diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 2243ec4925..48a5802f76 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -4431,7 +4431,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } } - public LSL_Key llObjectGetLinkKey(LSL_Key objectid, int linknum) + public LSL_Key llGetObjectLinkKey(LSL_Key objectid, int linknum) { if (!UUID.TryParse(objectid, out UUID oID)) return ScriptBaseClass.NULL_KEY; diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs index 737194b641..806143ee9e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs @@ -154,7 +154,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces LSL_Key llGetKey(); LSL_Key llGetLandOwnerAt(LSL_Vector pos); LSL_Key llGetLinkKey(int linknum); - LSL_Key llObjectGetLinkKey(LSL_Key objectid, int linknum); + LSL_Key llGetObjectLinkKey(LSL_Key objectid, int linknum); LSL_String llGetLinkName(int linknum); LSL_Integer llGetLinkNumber(); LSL_Integer llGetLinkNumberOfSides(int link); diff --git a/bin/ScriptSyntax.xml b/bin/ScriptSyntax.xml index a2355d638d..d10146dd61 100644 --- a/bin/ScriptSyntax.xml +++ b/bin/ScriptSyntax.xml @@ -1,4 +1,4 @@ -b60b609e-502d-3344-e38d-7fd0718cf5ea +face0493-6022-3cf1-bdbe-1ae375f7f2da llsd-lsl-syntax-version2 controls @@ -4337,6 +4337,14 @@ b60b609e-502d-3344-e38d-7fd0718cf5ea argstypelist + llGetObjectLinkKey + + returnkey + arguments + objectidtypekey + linknumtypeinteger + + llGetObjectMass returnfloat @@ -5199,14 +5207,6 @@ b60b609e-502d-3344-e38d-7fd0718cf5ea nametypestring - llObjectGetLinkKey - - returnkey - arguments - objectidtypekey - linknumtypeinteger - - llOffsetTexture arguments