From 62fbd2ef08ceabe87b00d22686677b40e23e29ce Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Fri, 15 Oct 2010 14:54:01 -0700 Subject: [PATCH] Undo SetAppearance supression. Debug statements --- OpenSim/Framework/AvatarAppearance.cs | 6 ++++-- .../RegionSync/RegionSyncModule/RegionSyncAvatar.cs | 11 ++++++++++- .../RegionSyncModule/RegionSyncClientView.cs | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 438812f2a3..9b99a70669 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs @@ -363,7 +363,8 @@ namespace OpenSim.Framework // This sets Visual Params with *less* weirder values then default. Instead of a ugly alien, it looks like a fat scientist SetDefaultParams(m_visualparams); SetDefaultWearables(); - m_texture = null;//GetDefaultTexture(); + // m_texture = null;//GetDefaultTexture(); + m_texture = GetDefaultTexture(); } public AvatarAppearance(UUID avatarID, AvatarWearable[] wearables, byte[] visualParams) @@ -372,7 +373,8 @@ namespace OpenSim.Framework m_serial = 1; m_wearables = wearables; m_visualparams = visualParams; - m_texture = null;// GetDefaultTexture(); + // m_texture = null;// GetDefaultTexture(); + m_texture = GetDefaultTexture(); } private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncAvatar.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncAvatar.cs index 90d1a24c69..01387201b3 100644 --- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncAvatar.cs +++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncAvatar.cs @@ -28,6 +28,8 @@ using System; using System.Collections.Generic; using System.Net; +using System.Reflection; +using log4net; using OpenMetaverse; using OpenMetaverse.Packets; using OpenSim.Framework; @@ -43,6 +45,8 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule private short count = 0; private short frame = 0; + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + // disable warning: public events, part of the public API #pragma warning disable 67 @@ -322,7 +326,9 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule m_firstName = first; m_lastName = last; m_startPos = startPos; - + + m_log.Debug("[REGION SYNC AVATAR] instance"); + //m_scene.EventManager.OnFrame += Update; } @@ -430,10 +436,12 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule public virtual void SendWearables(AvatarWearable[] wearables, int serial) { + m_log.Debug("[REGION SYNC AVATAR] SendWearables"); } public virtual void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry) { + m_log.Debug("[REGION SYNC AVATAR] SendAppearance"); } public virtual void Kick(string message) @@ -566,6 +574,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule public virtual void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID) { + m_log.Debug("[REGION SYNC AVATAR] AttachObject"); } public virtual void SendDialog(string objectname, UUID objectID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels) diff --git a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClientView.cs b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClientView.cs index 721cbec96b..9f7275a22a 100644 --- a/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClientView.cs +++ b/OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClientView.cs @@ -484,7 +484,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule { int delay = 30000; string name = presence.Name; - //m_log.WarnFormat("{0} Waiting {1}ms before setting appearance on presence {2} <{3}>", LogHeader, delay, name, msgID); + m_log.WarnFormat("{0} Waiting {1}ms before setting appearance on presence {2} <{3}>", LogHeader, delay, name, msgID); Timer appearanceSetter = new Timer(delegate(object obj) { //m_log.WarnFormat("{0} Ready to set appearance on presence {1} <{2}>", LogHeader, name, msgID);