mirror of https://github.com/opensim/opensim.git
update libomv
This commit is contained in:
parent
47810b04d5
commit
db04234685
|
@ -2658,7 +2658,7 @@ namespace OpenSim.Framework
|
|||
/// </param>
|
||||
/// <returns></returns>
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static byte[] StringToBytes256(string str)
|
||||
public static byte[] StringToBytes256(ReadOnlySpan<char> str)
|
||||
{
|
||||
return Utils.StringToBytes(str, 255);
|
||||
}
|
||||
|
@ -2689,7 +2689,7 @@ namespace OpenSim.Framework
|
|||
/// </param>
|
||||
/// <returns></returns>
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static byte[] StringToBytes1024(string str)
|
||||
public static byte[] StringToBytes1024(ReadOnlySpan<char> str)
|
||||
{
|
||||
return Utils.StringToBytes(str, 1024);
|
||||
}
|
||||
|
@ -2720,26 +2720,26 @@ namespace OpenSim.Framework
|
|||
/// </param>
|
||||
/// <returns></returns>
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static byte[] StringToBytes(string str, int MaxLength)
|
||||
public static byte[] StringToBytes(ReadOnlySpan<char> str, int MaxLength)
|
||||
{
|
||||
return Utils.StringToBytes(str, MaxLength);
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static byte[] StringToBytesNoTerm(string str, int MaxLength)
|
||||
public static byte[] StringToBytesNoTerm(ReadOnlySpan<char> str, int MaxLength)
|
||||
{
|
||||
return Utils.StringToBytesNoTerm(str, MaxLength);
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static int osUTF8Getbytes(string srcstr, byte[] dstarray, int maxdstlen, bool NullTerm = true)
|
||||
public static int osUTF8Getbytes(ReadOnlySpan<char> srcstr, byte[] dstarray, int maxdstlen, bool NullTerm = true)
|
||||
{
|
||||
return osUTF8Getbytes(srcstr, dstarray, 0, maxdstlen, NullTerm);
|
||||
}
|
||||
|
||||
public static unsafe int osUTF8Getbytes(string srcstr, byte* dstarray, int maxdstlen, bool NullTerm = true)
|
||||
public static unsafe int osUTF8Getbytes(ReadOnlySpan<char> srcstr, byte* dstarray, int maxdstlen, bool NullTerm = true)
|
||||
{
|
||||
if (string.IsNullOrEmpty(srcstr))
|
||||
if (srcstr.Length == 0)
|
||||
return 0;
|
||||
|
||||
fixed (char* srcbase = srcstr)
|
||||
|
@ -2748,9 +2748,9 @@ namespace OpenSim.Framework
|
|||
}
|
||||
}
|
||||
|
||||
public static unsafe int osUTF8Getbytes(string srcstr, byte[] dstarray, int pos, int maxdstlen, bool NullTerm = true)
|
||||
public static unsafe int osUTF8Getbytes(ReadOnlySpan<char> srcstr, byte[] dstarray, int pos, int maxdstlen, bool NullTerm = true)
|
||||
{
|
||||
if (string.IsNullOrEmpty(srcstr))
|
||||
if (srcstr.Length == 0)
|
||||
return 0;
|
||||
|
||||
if (pos + maxdstlen > dstarray.Length)
|
||||
|
|
|
@ -424,9 +424,8 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||
LLSDxmlEncode2.AddEndMapAndArray(sb);
|
||||
|
||||
LLSDxmlEncode2.AddRawElem("<key>FolderData</key><array><map><key>FolderID</key><uuid>00000000-0000-0000-0000-000000000000</uuid><key>Name</key><string></string><key>ParentID</key><uuid>00000000-0000-0000-0000-000000000000</uuid ><key>Type</key ><integer>-1</integer></map ></array>",sb);
|
||||
|
||||
osUTF8 osName = new osUTF8(Utils.StringToBytesNoTerm(item.Name, 255));
|
||||
osUTF8 osDesc = new osUTF8(Utils.StringToBytesNoTerm(item.Description, 255));
|
||||
osUTF8 osName = new osUTF8(item.Name, 255);
|
||||
osUTF8 osDesc = new osUTF8(item.Description, 255);
|
||||
|
||||
LLSDxmlEncode2.AddArray("ItemData", sb);
|
||||
LLSDxmlEncode2.AddMap(sb);
|
||||
|
|
|
@ -26,22 +26,12 @@
|
|||
*/
|
||||
|
||||
using System;
|
||||
using System.Xml;
|
||||
using System.Collections.Generic;
|
||||
using System.Reflection;
|
||||
using System.Threading;
|
||||
using System.Timers;
|
||||
using Timer = System.Timers.Timer;
|
||||
using OpenMetaverse;
|
||||
using OpenMetaverse.StructuredData;
|
||||
using log4net;
|
||||
//using log4net;
|
||||
using Nini.Config;
|
||||
using OpenSim.Framework;
|
||||
using OpenSim.Framework.Client;
|
||||
using OpenSim.Framework.Monitoring;
|
||||
using OpenSim.Region.Framework.Interfaces;
|
||||
using OpenSim.Region.Framework.Scenes.Types;
|
||||
using OpenSim.Services.Interfaces;
|
||||
|
||||
|
||||
namespace OpenSim.Region.Framework.Scenes
|
||||
{
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue