This commit is contained in:
Madpeterz 2021-04-03 21:53:46 +01:00
parent 794d3a1985
commit 441f953712
3 changed files with 19 additions and 6 deletions

View file

@ -2249,7 +2249,7 @@ namespace OpenMetaverse
break; break;
} }
if (vpIndex <= nrParams) break; if (vpIndex >= nrParams) break;
} }
MyVisualParameters = new byte[set.VisualParam.Length]; MyVisualParameters = new byte[set.VisualParam.Length];
@ -2268,11 +2268,18 @@ namespace OpenMetaverse
Primitive.TextureEntry te = new Primitive.TextureEntry(DEFAULT_AVATAR_TEXTURE); Primitive.TextureEntry te = new Primitive.TextureEntry(DEFAULT_AVATAR_TEXTURE);
for (uint i = 0; i < Textures.Length; i++) for (uint i = 0; i < Textures.Length; i++)
{
if (Textures[i].TextureID != UUID.Zero)
{ {
Primitive.TextureEntryFace face = te.CreateFace(i); Primitive.TextureEntryFace face = te.CreateFace(i);
face.TextureID = Textures[i].TextureID; face.TextureID = Textures[i].TextureID;
Logger.DebugLog("Sending texture entry for " + (AvatarTextureIndex)i + " to " + Textures[i].TextureID, Client); Logger.DebugLog("Sending texture entry for " + (AvatarTextureIndex)i + " to " + Textures[i].TextureID, Client);
} }
else
{
Logger.DebugLog("Skipping texture entry for " + (AvatarTextureIndex)i + " its null", Client);
}
}
set.ObjectData.TextureEntry = te.GetBytes(); set.ObjectData.TextureEntry = te.GetBytes();
MyTextures = te; MyTextures = te;

View file

@ -347,7 +347,7 @@ namespace OpenMetaverse
/// You will get no output on the console. This behavior can be overriden by creating /// You will get no output on the console. This behavior can be overriden by creating
/// a logger configuration file for log4net /// a logger configuration file for log4net
/// </summary> /// </summary>
public static Helpers.LogLevel LOG_LEVEL = Helpers.LogLevel.None; public static Helpers.LogLevel LOG_LEVEL = Helpers.LogLevel.Debug;
/// <summary>Attach avatar names to log messages</summary> /// <summary>Attach avatar names to log messages</summary>
public bool LOG_NAMES = true; public bool LOG_NAMES = true;

View file

@ -25,6 +25,7 @@
*/ */
using System; using System;
using System.Collections.Generic;
using OpenMetaverse.Packets; using OpenMetaverse.Packets;
namespace OpenMetaverse namespace OpenMetaverse
@ -152,6 +153,7 @@ namespace OpenMetaverse
// FIXME: // FIXME:
} }
protected List<TerrainPatch.LayerType> suppressWarningTypes = new List<TerrainPatch.LayerType>();
private void LayerDataHandler(object sender, PacketReceivedEventArgs e) private void LayerDataHandler(object sender, PacketReceivedEventArgs e)
{ {
LayerDataPacket layer = (LayerDataPacket)e.Packet; LayerDataPacket layer = (LayerDataPacket)e.Packet;
@ -182,7 +184,11 @@ namespace OpenMetaverse
DecompressCloud(e.Simulator, bitpack, header); DecompressCloud(e.Simulator, bitpack, header);
break; break;
default: default:
Logger.Log("Unrecognized LayerData type " + type, Helpers.LogLevel.Warning, Client); if (suppressWarningTypes.Contains(type) == false)
{
suppressWarningTypes.Add(type);
Logger.Log("Unrecognized LayerData type " + type + " - Suppressing repeated messages", Helpers.LogLevel.Warning, Client);
}
break; break;
} }
} }