diff --git a/LibreMetaverse/GridClient.cs b/LibreMetaverse/GridClient.cs index 34c6b242..28b14ad2 100644 --- a/LibreMetaverse/GridClient.cs +++ b/LibreMetaverse/GridClient.cs @@ -156,12 +156,10 @@ private HttpCapsClient SetupHttpCapsClient() return true; } }; -#if NETSTANDARD2_1_OR_GREATER || NET48_OR_GREATER || NETCOREAPP3_1_OR_GREATER -#if NET_4_6 // a unity preproc def, not to be confused with NET46 from MS! + if (Utils.GetRunningRuntime() != Utils.Runtime.Mono) -#endif handler.MaxConnectionsPerServer = Settings.MAX_HTTP_CONNECTIONS; -#endif + HttpCapsClient client = new HttpCapsClient(handler); client.DefaultRequestHeaders.Accept.Clear(); client.DefaultRequestHeaders.Add("User-Agent", $"{Settings.USER_AGENT}"); diff --git a/LibreMetaverse/Primitives/TextureEntry.cs b/LibreMetaverse/Primitives/TextureEntry.cs index 5359703b..3cf9f514 100644 --- a/LibreMetaverse/Primitives/TextureEntry.cs +++ b/LibreMetaverse/Primitives/TextureEntry.cs @@ -768,16 +768,11 @@ public static TextureEntry FromOSD(OSD osd) private void FromBytes(byte[] data, int pos, int length) { + DefaultTexture = new TextureEntryFace(null); + if (length < 16) - { // No TextureEntry to process - DefaultTexture = null; return; - } - else - { - DefaultTexture = new TextureEntryFace(null); - } uint bitfieldSize = 0; uint faceBits = 0;