From 79bb22eaf6e79d13a6df13d285c676b06a646cd5 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 15 May 2020 15:11:06 +0100 Subject: [PATCH] fix typo --- OpenSim/Framework/LLSDxmlEncode.cs | 26 +++++++++---------- .../Framework/Interfaces/IEventQueue.cs | 1 + .../Common/Mock/TestEventQueueGetModule.cs | 5 ++++ 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/OpenSim/Framework/LLSDxmlEncode.cs b/OpenSim/Framework/LLSDxmlEncode.cs index 31d5ccc06c..0f020932a1 100644 --- a/OpenSim/Framework/LLSDxmlEncode.cs +++ b/OpenSim/Framework/LLSDxmlEncode.cs @@ -153,17 +153,17 @@ namespace OpenSim.Framework } } - public static void AddElem(byte[] e, int start, int lenght, StringBuilder sb) + public static void AddElem(byte[] e, int start, int length, StringBuilder sb) { - if (start + lenght >= e.Length) - lenght = e.Length - start; + if (start + length >= e.Length) + length = e.Length - start; - if (e == null || e.Length == 0 || lenght <= 0) + if (e == null || e.Length == 0 || length <= 0) sb.Append("binary />"); else { sb.Append(""); // encode64 is default - base64Encode(e, start, lenght, sb); + base64Encode(e, start, length, sb); sb.Append(""); } } @@ -476,21 +476,21 @@ namespace OpenSim.Framework } } - public static void AddElem(string name, byte[] e, int start, int lenght, StringBuilder sb) + public static void AddElem(string name, byte[] e, int start, int length, StringBuilder sb) { sb.Append(""); sb.Append(name); sb.Append(""); - if (start + lenght >= e.Length) - lenght = e.Length - start; + if (start + length >= e.Length) + length = e.Length - start; - if (e == null || e.Length == 0 || lenght <= 0) + if (e == null || e.Length == 0 || length <= 0) sb.Append("binary />"); else { sb.Append(""); // encode64 is default - base64Encode(e, start, lenght, sb); + base64Encode(e, start, length, sb); sb.Append(""); } } @@ -870,10 +870,10 @@ namespace OpenSim.Framework } } - public static unsafe void base64Encode(byte[] data, int start, int lenght, StringBuilder sb) + public static unsafe void base64Encode(byte[] data, int start, int length, StringBuilder sb) { - int lenMod3 = lenght % 3; - int len = start + (lenght - lenMod3); + int lenMod3 = length % 3; + int len = start + (length - lenMod3); fixed (byte* d = data) { diff --git a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs index 96c9b5a147..42254a7824 100644 --- a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs +++ b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs @@ -106,6 +106,7 @@ namespace OpenSim.Region.Framework.Interfaces void partPhysicsProperties(uint localID, byte physhapetype, float density, float friction, float bounce, float gravmod, UUID avatarID); void WindlightRefreshEvent(int interpolate, UUID avatarID); StringBuilder StartEvent(string eventName); + StringBuilder StartEvent(string eventName, int cap); string EndEvent(StringBuilder sb); byte[] EndEventToBytes(StringBuilder sb); } diff --git a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs index ef40c3c0ee..c43927aecd 100644 --- a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs +++ b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs @@ -212,6 +212,11 @@ namespace OpenSim.Tests.Common return null; } + public StringBuilder StartEvent(string eventName, int cap) + { + return null; + } + public string EndEvent(StringBuilder sb) { return "";