From 6f389ba4cf54d7e964b98430f7a6601d3ec0c73b Mon Sep 17 00:00:00 2001 From: Charles Krinke Date: Tue, 18 Dec 2007 02:41:34 +0000 Subject: Many Thanks to Alondria for adding: The list type and a bunch of support functions to LSL Added/ReImplmented: llGetListLength(), llList2Integer(), osList2Double() (note rename), llList2Float(), llList2String(), llList2Key(), llList2Vector(), llList2Rot(), llList2List(), llDeleteSubList(), llGetListEntryType(), llList2CSV(), llCSV2List(), llListInsertList(), llDumpList2String(), Borked Still: llListSort(), llListRandomize(), llList2ListStrided(), llListFindList(), Changed: llHTTPRequest() (Made wrapper of LSL_Types.list->List) --- .../DotNetEngine/Compiler/LSL/LSL2CSConverter.cs | 4 +- .../DotNetEngine/Compiler/LSL/LSL_BaseClass.cs | 64 +++++++++++----------- 2 files changed, 34 insertions(+), 34 deletions(-) (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL') diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs index 00ddbba..4063647 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs @@ -47,7 +47,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL dataTypes.Add("key", "string"); dataTypes.Add("vector", "LSL_Types.Vector3"); dataTypes.Add("rotation", "LSL_Types.Quaternion"); - dataTypes.Add("list", "List"); + dataTypes.Add("list", "LSL_Types.list"); dataTypes.Add("null", "null"); } @@ -259,7 +259,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL // Replace List []'s Script = - Regex.Replace(Script, @"\[([^\]]*)\]", @"List.Parse($1)", + Regex.Replace(Script, @"\[([^\]]*)\]", @"new LSL_Types.list($1)", RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline); diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs index d669c15..1657b74 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs @@ -1061,12 +1061,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL return m_LSL_Functions.llGetCenterOfMass(); } - public List llListSort(List src, int stride, int ascending) + public LSL_Types.list llListSort(LSL_Types.list src, int stride, int ascending) { return m_LSL_Functions.llListSort(src, stride, ascending); } - public int llGetListLength(List src) + public int llGetListLength(LSL_Types.list src) { return m_LSL_Functions.llGetListLength(src); } @@ -1074,67 +1074,67 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL // // DO NOT MODIFY HERE: MODIFY IN LSL_BuiltIn_Commands.cs // - public int llList2Integer(List src, int index) + public int llList2Integer(LSL_Types.list src, int index) { return m_LSL_Functions.llList2Integer(src, index); } - public double llList2double(List src, int index) + public double osList2Double(LSL_Types.list src, int index) { - return m_LSL_Functions.llList2double(src, index); + return m_LSL_Functions.osList2Double(src, index); } - public string llList2String(List src, int index) + public string llList2String(LSL_Types.list src, int index) { return m_LSL_Functions.llList2String(src, index); } - public string llList2Key(List src, int index) + public string llList2Key(LSL_Types.list src, int index) { return m_LSL_Functions.llList2Key(src, index); } - public vector llList2Vector(List src, int index) + public vector llList2Vector(LSL_Types.list src, int index) { return m_LSL_Functions.llList2Vector(src, index); } - public rotation llList2Rot(List src, int index) + public rotation llList2Rot(LSL_Types.list src, int index) { return m_LSL_Functions.llList2Rot(src, index); } - public List llList2List(List src, int start, int end) + public LSL_Types.list llList2List(LSL_Types.list src, int start, int end) { return m_LSL_Functions.llList2List(src, start, end); } - public List llDeleteSubList(List src, int start, int end) + public LSL_Types.list llDeleteSubList(LSL_Types.list src, int start, int end) { return m_LSL_Functions.llDeleteSubList(src, start, end); } - public int llGetListEntryType(List src, int index) + public int llGetListEntryType(LSL_Types.list src, int index) { return m_LSL_Functions.llGetListEntryType(src, index); } - public string llList2CSV(List src) + public string llList2CSV(LSL_Types.list src) { return m_LSL_Functions.llList2CSV(src); } - public List llCSV2List(string src) + public LSL_Types.list llCSV2List(string src) { return m_LSL_Functions.llCSV2List(src); } - public List llListRandomize(List src, int stride) + public LSL_Types.list llListRandomize(LSL_Types.list src, int stride) { return m_LSL_Functions.llListRandomize(src, stride); } - public List llList2ListStrided(List src, int start, int end, int stride) + public LSL_Types.list llList2ListStrided(LSL_Types.list src, int start, int end, int stride) { return m_LSL_Functions.llList2ListStrided(src, start, end, stride); } @@ -1144,12 +1144,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL return m_LSL_Functions.llGetRegionCorner(); } - public List llListInsertList(List dest, List src, int start) + public LSL_Types.list llListInsertList(LSL_Types.list dest, LSL_Types.list src, int start) { return m_LSL_Functions.llListInsertList(dest, src, start); } - public int llListFindList(List src, List test) + public int llListFindList(LSL_Types.list src, LSL_Types.list test) { return m_LSL_Functions.llListFindList(src, test); } @@ -1375,9 +1375,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL m_LSL_Functions.llSetCameraAtOffset(offset); } - public void llDumpList2String() + public string llDumpList2String(LSL_Types.list src, string seperator) { - m_LSL_Functions.llDumpList2String(); + return m_LSL_Functions.llDumpList2String(src, seperator); } public void llScriptDanger(vector pos) @@ -1385,7 +1385,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL m_LSL_Functions.llScriptDanger(pos); } - public void llDialog(string avatar, string message, List buttons, int chat_channel) + public void llDialog(string avatar, string message, LSL_Types.list buttons, int chat_channel) { m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel); } @@ -1448,7 +1448,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL return m_LSL_Functions.llMD5String(src, nonce); } - public void llSetPrimitiveParams(List rules) + public void llSetPrimitiveParams(LSL_Types.list rules) { m_LSL_Functions.llSetPrimitiveParams(rules); } @@ -1483,7 +1483,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL return m_LSL_Functions.llLog(val); } - public List llGetAnimationList(string id) + public LSL_Types.list llGetAnimationList(string id) { return m_LSL_Functions.llGetAnimationList(id); } @@ -1538,7 +1538,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL return m_LSL_Functions.llGetNumberOfNotecardLines(name); } - public List llGetBoundingBox(string obj) + public LSL_Types.list llGetBoundingBox(string obj) { return m_LSL_Functions.llGetBoundingBox(obj); } @@ -1581,7 +1581,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL m_LSL_Functions.llSetLocalRot(rot); } - public List llParseStringKeepNulls(string src, List seperators, List spacers) + public LSL_Types.list llParseStringKeepNulls(string src, LSL_Types.list seperators, LSL_Types.list spacers) { return m_LSL_Functions.llParseStringKeepNulls(src, seperators, spacers); } @@ -1646,7 +1646,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL m_LSL_Functions.llLoadURL(avatar_id, message, url); } - public void llParcelMediaCommandList(List commandList) + public void llParcelMediaCommandList(LSL_Types.list commandList) { m_LSL_Functions.llParcelMediaCommandList(commandList); } @@ -1669,7 +1669,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL return m_LSL_Functions.llGetInventoryType(name); } - public void llSetPayPrice(int price, List quick_pay_buttons) + public void llSetPayPrice(int price, LSL_Types.list quick_pay_buttons) { m_LSL_Functions.llSetPayPrice(price, quick_pay_buttons); } @@ -1724,7 +1724,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL m_LSL_Functions.llRemoveFromLandBanList(avatar); } - public void llSetCameraParams(List rules) + public void llSetCameraParams(LSL_Types.list rules) { m_LSL_Functions.llSetCameraParams(rules); } @@ -1734,7 +1734,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL m_LSL_Functions.llClearCameraParams(); } - public double llListStatistics(int operation, List src) + public double llListStatistics(int operation, LSL_Types.list src) { return m_LSL_Functions.llListStatistics(operation, src); } @@ -1759,7 +1759,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL return m_LSL_Functions.llXorBase64StringsCorrect(str1, str2); } - public string llHTTPRequest(string url, List parameters, string body) + public string llHTTPRequest(string url, LSL_Types.list parameters, string body) { return m_LSL_Functions.llHTTPRequest(url, parameters, body); } @@ -1779,7 +1779,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL return m_LSL_Functions.llGetParcelPrimCount(pos, category, sim_wide); } - public List llGetParcelPrimOwners(vector pos) + public LSL_Types.list llGetParcelPrimOwners(vector pos) { return m_LSL_Functions.llGetParcelPrimOwners(pos); } @@ -1797,7 +1797,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL return m_LSL_Functions.llGetParcelMaxPrims(pos, sim_wide); } - public List llGetParcelDetails(vector pos, List param) + public LSL_Types.list llGetParcelDetails(vector pos, LSL_Types.list param) { return m_LSL_Functions.llGetParcelDetails(pos, param); } -- cgit v1.1