From e94b36059e8eab27feb367847c75c77ac6e58b31 Mon Sep 17 00:00:00 2001 From: Christopher Date: Wed, 10 Jun 2020 09:20:15 +0200 Subject: [PATCH] change patch --- Patch/0001-add-os-commands-to-pathfind.patch | 547 ++----------------- 1 file changed, 31 insertions(+), 516 deletions(-) diff --git a/Patch/0001-add-os-commands-to-pathfind.patch b/Patch/0001-add-os-commands-to-pathfind.patch index 1558912..0433c60 100644 --- a/Patch/0001-add-os-commands-to-pathfind.patch +++ b/Patch/0001-add-os-commands-to-pathfind.patch @@ -1,17 +1,13 @@ -From 6ce364892b899469ecac48c76838747106a84c93 Mon Sep 17 00:00:00 2001 -From: Christopher Latza -Date: Wed, 10 Jun 2020 01:54:17 +0200 -Subject: [PATCH] add os commands to patchfind +From e502bb78dd38482366c3b4675226265bae668bdd Mon Sep 17 00:00:00 2001 +From: Christopher +Date: Wed, 10 Jun 2020 09:19:20 +0200 +Subject: [PATCH] change pathfinding args --- - .../Shared/Api/Implementation/OSSL_Api.cs | 54 +++ - .../Shared/Api/Interface/IOSSL_Api.cs | 4 + - .../Shared/Api/Runtime/OSSL_Stub.cs | 10 + - bin/inventory/4Creative/4CreativeFolders.xml | 50 ++ - bin/inventory/4Creative/4CreativeItems.xml | 436 ++++++++++++++++++ - 5 files changed, 554 insertions(+) - create mode 100644 bin/inventory/4Creative/4CreativeFolders.xml - create mode 100644 bin/inventory/4Creative/4CreativeItems.xml + .../Shared/Api/Implementation/OSSL_Api.cs | 54 +++++++++++++++++++ + .../Shared/Api/Interface/IOSSL_Api.cs | 6 ++- + .../Shared/Api/Runtime/OSSL_Stub.cs | 11 ++++ + 3 files changed, 70 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 5e6271c8a7..008640fe31 100644 @@ -86,29 +82,46 @@ index 5e6271c8a7..008640fe31 100644 { // if enabled It can be used to destroy diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs -index 9b4a9ca12d..a8d205fcfb 100644 +index 9b4a9ca12d..ac5f5bda1e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +@@ -38,7 +38,7 @@ using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; + using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat; + using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion; + using LSL_Key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; +- ++using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; + + namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces + { @@ -134,6 +134,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces LSL_Float osTerrainGetHeight(int x, int y); // Deprecated LSL_Integer osSetTerrainHeight(int x, int y, double val); LSL_Integer osTerrainSetHeight(int x, int y, double val); //Deprecated + -+ LSL_List osGetPathfindingPath(vector _source, vector _target); ++ LSL_List osGetPathfindingPath(LSL_Vector _source, LSL_Vector _target); + LSL_List osGetObjectIDListByName(LSL_List _nameList); + //ApiDesc Send terrain to all agents void osTerrainFlush(); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs -index ba5158a2ff..61d80fe4d1 100644 +index ba5158a2ff..f79c90e2cb 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs -@@ -205,6 +205,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase +@@ -44,6 +44,7 @@ using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; + using LSL_Key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; + using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat; + using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; ++using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3; + + namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase + { +@@ -205,6 +206,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase return m_OSSL_Functions.osTerrainSetHeight(x, y, val); } -+ public LSL_List osGetPathfindingPath(vector _source, vector _target) ++ public LSL_List osGetPathfindingPath(LSL_Vector _source, LSL_Vector _target) + { + return m_OSSL_Functions.osGetPathfindingPath(_source, _target); + } @@ -121,504 +134,6 @@ index ba5158a2ff..61d80fe4d1 100644 public void osTerrainFlush() { m_OSSL_Functions.osTerrainFlush(); -diff --git a/bin/inventory/4Creative/4CreativeFolders.xml b/bin/inventory/4Creative/4CreativeFolders.xml -new file mode 100644 -index 0000000000..cc85b34e9c ---- /dev/null -+++ b/bin/inventory/4Creative/4CreativeFolders.xml -@@ -0,0 +1,50 @@ -+ -+
-+ -+ -+ -+ -+
-+
-+ -+ -+ -+ -+
-+
-+ -+ -+ -+ -+
-+
-+ -+ -+ -+ -+
-+
-+ -+ -+ -+ -+
-+
-+ -+ -+ -+ -+
-+
-+ -+ -+ -+ -+
-+
-+ -+ -+ -+ -+
-+
-diff --git a/bin/inventory/4Creative/4CreativeItems.xml b/bin/inventory/4Creative/4CreativeItems.xml -new file mode 100644 -index 0000000000..42ad006219 ---- /dev/null -+++ b/bin/inventory/4Creative/4CreativeItems.xml -@@ -0,0 +1,436 @@ -+ -+ -+ -+ -+ -+ -+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+ -+ -+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+ -+
-+ -+ -+ -+ -+ -+ -+ -+
-+
-- -2.27.0.windows.1 +2.25.1.windows.1