diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 7e3da18f5c..8168c1121f 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs @@ -2643,12 +2643,13 @@ namespace OpenSim.Framework /// Arguments to substitute into the string via the {} mechanism. /// /// + /* [MethodImpl(MethodImplOptions.AggressiveInlining)] public static byte[] StringToBytes256(string str, params object[] args) { return Utils.StringToBytes(string.Format(str, args), 255); } - + */ /// /// Convert a string to a byte format suitable for transport in an LLUDP packet. The output is truncated to 256 bytes if necessary. /// @@ -2674,11 +2675,13 @@ namespace OpenSim.Framework /// Arguments to substitute into the string via the {} mechanism. /// /// + /* [MethodImpl(MethodImplOptions.AggressiveInlining)] public static byte[] StringToBytes1024(string str, params object[] args) { - return Utils.StringToBytes(string.Format(str, args), 1024); + return Utils.StringToBytes(string.Format(str, args).AsSpan(), 1024); } + */ /// /// Convert a string to a byte format suitable for transport in an LLUDP packet. The output is truncated to 1024 bytes if necessary. @@ -2705,11 +2708,13 @@ namespace OpenSim.Framework /// Arguments to substitute into the string via the {} mechanism. /// /// + /* [MethodImpl(MethodImplOptions.AggressiveInlining)] public static byte[] StringToBytes(string str, int MaxLength, params object[] args) { - return StringToBytes1024(string.Format(str, args), MaxLength); + return Utils.StringToBytes(string.Format(str, args).AsSpan(), MaxLength); } + */ /// /// Convert a string to a byte format suitable for transport in an LLUDP packet. The output is truncated to MaxLength bytes if necessary. diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 139f94c360..9161310d93 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -3708,7 +3708,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api Position = pos, RegionID = World.RegionInfo.RegionID.Guid, message = (message.Length > 1024) ? message[..1024] : message, - binaryBucket = Util.StringToBytes256("{0}/{1}/{2}/{3}", m_regionName, (int)pos.X, (int)pos.Y, (int)pos.Z) + binaryBucket = Util.StringToBytes256($"{m_regionName}/{(int)pos.X}/{(int)pos.Y}/{(int)pos.Z}") }; m_TransferModule?.SendInstantMessage(msg, delegate(bool success) {}); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs index bca218d713..82320ce88d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs @@ -459,6 +459,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase public const int PRIM_REFLECTION_PROBE = 44; + public const int PRIM_GLTF_NORMAL = 45; + public const int PRIM_GLTF_EMISSIVE = 46; + public const int PRIM_GLTF_METALLIC_ROUGHNESS = 47; + public const int PRIM_GLTF_BASE_COLOR = 48; + public const int PRIM_RENDER_MATERIAL = 49; // parameters