diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index a4bb7654e2..9494410a45 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs @@ -329,9 +329,8 @@ namespace OpenSim.Framework public AvatarAppearance(UUID owner) { -// DEBUG ON - m_log.WarnFormat("[AVATAR APPEARANCE] create empty appearance for {0}",owner); -// DEBUG OFF +// m_log.WarnFormat("[AVATAR APPEARANCE]: create empty appearance for {0}",owner); + m_serial = 1; m_owner = owner; @@ -345,9 +344,8 @@ namespace OpenSim.Framework public AvatarAppearance(UUID avatarID, OSDMap map) { -// DEBUG ON - m_log.WarnFormat("[AVATAR APPEARANCE] create appearance for {0} from OSDMap",avatarID); -// DEBUG OFF +// m_log.WarnFormat("[AVATAR APPEARANCE]: create appearance for {0} from OSDMap",avatarID); + m_owner = avatarID; Unpack(map); SetHeight(); @@ -355,9 +353,8 @@ namespace OpenSim.Framework public AvatarAppearance(UUID avatarID, AvatarWearable[] wearables, Primitive.TextureEntry textureEntry, byte[] visualParams) { -// DEBUG ON - m_log.WarnFormat("[AVATAR APPEARANCE] create initialized appearance for {0}",avatarID); -// DEBUG OFF +// m_log.WarnFormat("[AVATAR APPEARANCE] create initialized appearance for {0}",avatarID); + m_serial = 1; m_owner = avatarID; @@ -383,9 +380,8 @@ namespace OpenSim.Framework public AvatarAppearance(AvatarAppearance appearance) { -// DEBUG ON - m_log.WarnFormat("[AVATAR APPEARANCE] create from an existing appearance"); -// DEBUG OFF +// m_log.WarnFormat("[AVATAR APPEARANCE] create from an existing appearance"); + if (appearance == null) { m_serial = 1; @@ -479,10 +475,9 @@ namespace OpenSim.Framework } changed = true; -// DEBUG ON - if (newface != null) - m_log.WarnFormat("[AVATAR APPEARANCE] index {0}, new texture id {1}",i,newface.TextureID); -// DEBUG OFF + +// if (newface != null) +// m_log.WarnFormat("[AVATAR APPEARANCE]: index {0}, new texture id {1}",i,newface.TextureID); } m_texture = textureEntry; @@ -742,7 +737,7 @@ namespace OpenSim.Framework } else { - m_log.Warn("[AVATARAPPEARANCE] failed to unpack wearables"); + m_log.Warn("[AVATAR APPEARANCE]: failed to unpack wearables"); } // Avatar Textures @@ -760,7 +755,7 @@ namespace OpenSim.Framework } else { - m_log.Warn("[AVATARAPPEARANCE] failed to unpack textures"); + m_log.Warn("[AVATAR APPEARANCE]: failed to unpack textures"); } // Visual Parameters @@ -772,7 +767,7 @@ namespace OpenSim.Framework } else { - m_log.Warn("[AVATARAPPEARANCE] failed to unpack visual parameters"); + m_log.Warn("[AVATAR APPEARANCE]: failed to unpack visual parameters"); } // Attachments @@ -786,7 +781,7 @@ namespace OpenSim.Framework } catch (Exception e) { - m_log.ErrorFormat("[AVATARAPPEARANCE] unpack failed badly: {0}",e.Message); + m_log.ErrorFormat("[AVATAR APPEARANCE]: unpack failed badly: {0}{1}", e.Message, e.StackTrace); } } diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs index 872de9a082..7b0e053c26 100644 --- a/OpenSim/Framework/Capabilities/Caps.cs +++ b/OpenSim/Framework/Capabilities/Caps.cs @@ -988,9 +988,7 @@ namespace OpenSim.Framework.Capabilities public void BakedTextureUploaded(UUID assetID, byte[] data) { -// DEBUG ON - m_log.WarnFormat("[CAPS]: Received baked texture {0}", assetID.ToString()); -// DEBUG OFF +// m_log.WarnFormat("[CAPS]: Received baked texture {0}", assetID.ToString()); AssetBase asset; asset = new AssetBase(assetID, "Baked Texture", (sbyte)AssetType.Texture, m_agentID.ToString()); asset.Data = data; diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index bfbbcf84f1..e2755c8c6f 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs @@ -117,7 +117,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory ScenePresence sp = m_scene.GetScenePresence(client.AgentId); if (sp == null) { - m_log.WarnFormat("[AVFACTORY] SetAppearance unable to find presence for {0}",client.AgentId); + m_log.WarnFormat("[AVATAR FACTORY MODULE]: SetAppearance unable to find presence for {0}", client.AgentId); return false; } @@ -147,14 +147,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory /// public void SetAppearance(IClientAPI client, Primitive.TextureEntry textureEntry, byte[] visualParams) { -// DEBUG ON - m_log.WarnFormat("[AVFACTORY] SetAppearance for {0}",client.AgentId); -// DEBUG OFF +// m_log.WarnFormat("[AVATAR FACTORY MODULE]: SetAppearance for {0}",client.AgentId); ScenePresence sp = m_scene.GetScenePresence(client.AgentId); if (sp == null) { - m_log.WarnFormat("[AVFACTORY] SetAppearance unable to find presence for {0}",client.AgentId); + m_log.WarnFormat("[AVATAR FACTORY MODULE]: SetAppearance unable to find presence for {0}",client.AgentId); return; } @@ -212,8 +210,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory { if (m_scene.AssetService.Get(textureID.ToString()) == null) { - m_log.WarnFormat("[AVFACTORY]: Missing baked texture {0} ({1}) for avatar {2}", - textureID,idx,client.Name); + m_log.WarnFormat("[AVATAR FACTORY MODULE]: Missing baked texture {0} ({1}) for avatar {2}", + textureID, idx, client.Name); return false; } return true; @@ -223,9 +221,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory public void QueueAppearanceSend(UUID agentid) { -// DEBUG ON - m_log.WarnFormat("[AVFACTORY] Queue appearance send for {0}",agentid); -// DEBUG OFF +// m_log.WarnFormat("[AVATAR FACTORY MODULE]: Queue appearance send for {0}",agentid); // 100 nanoseconds (ticks) we should wait long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_sendtime * 10000000); @@ -238,9 +234,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory public void QueueAppearanceSave(UUID agentid) { -// DEBUG ON - m_log.WarnFormat("[AVFACTORY] Queue appearance save for {0}",agentid); -// DEBUG OFF +// m_log.WarnFormat("[AVATAR FACTORY MODULE]: Queue appearance save for {0}",agentid); // 100 nanoseconds (ticks) we should wait long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_savetime * 10000000); @@ -256,13 +250,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory ScenePresence sp = m_scene.GetScenePresence(agentid); if (sp == null) { - m_log.WarnFormat("[AVFACTORY] Agent {0} no longer in the scene",agentid); + m_log.WarnFormat("[AVATAR FACTORY MODULE]: Agent {0} no longer in the scene", agentid); return; } -// DEBUG ON - m_log.WarnFormat("[AVFACTORY] Handle appearance send for {0}",agentid); -// DEBUG OFF +// m_log.WarnFormat("[AVATAR FACTORY MODULE]: Handle appearance send for {0}", agentid); // Send the appearance to everyone in the scene sp.SendAppearanceToAllOtherAgents(); @@ -288,7 +280,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory ScenePresence sp = m_scene.GetScenePresence(agentid); if (sp == null) { - m_log.WarnFormat("[AVFACTORY] Agent {0} no longer in the scene",agentid); + m_log.WarnFormat("[AVATAR FACTORY MODULE]: Agent {0} no longer in the scene", agentid); return; } @@ -339,13 +331,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory ScenePresence sp = m_scene.GetScenePresence(client.AgentId); if (sp == null) { - m_log.WarnFormat("[AVFACTORY] SendWearables unable to find presence for {0}",client.AgentId); + m_log.WarnFormat("[AVATAR FACTORY MODULE]: SendWearables unable to find presence for {0}", client.AgentId); return; } - -// DEBUG ON - m_log.WarnFormat("[AVFACTORY]: Received request for wearables of {0}", client.AgentId); -// DEBUG OFF + +// m_log.WarnFormat("[AVATAR FACTORY MODULE]: Received request for wearables of {0}", client.AgentId); + client.SendWearables(sp.Appearance.Wearables,sp.Appearance.Serial++); } @@ -359,13 +350,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory ScenePresence sp = m_scene.GetScenePresence(client.AgentId); if (sp == null) { - m_log.WarnFormat("[AVFACTORY] AvatarIsWearing unable to find presence for {0}",client.AgentId); + m_log.WarnFormat("[AVATAR FACTORY MODULE]: AvatarIsWearing unable to find presence for {0}", client.AgentId); return; } -// DEBUG ON - m_log.WarnFormat("[AVFACTORY]: AvatarIsWearing called for {0}",client.AgentId); -// DEBUG OFF +// m_log.WarnFormat("[AVATAR FACTORY MODULE]: AvatarIsWearing called for {0}",client.AgentId); AvatarAppearance avatAppearance = new AvatarAppearance(sp.Appearance); @@ -409,7 +398,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory else { m_log.ErrorFormat( - "[AVFACTORY]: Can't find inventory item {0} for {1}, setting to default", + "[AVATAR FACTORY MODULE]: Can't find inventory item {0} for {1}, setting to default", appearance.Wearables[i].ItemID, (WearableType)i); appearance.Wearables[i].ItemID = UUID.Zero; @@ -420,7 +409,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory } else { - m_log.WarnFormat("[AVFACTORY]: user {0} has no inventory, appearance isn't going to work", userID); + m_log.WarnFormat("[AVATAR FACTORY MODULE]: user {0} has no inventory, appearance isn't going to work", userID); } } } diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 1fc3ed6122..29cf0e5d6c 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -2393,13 +2393,13 @@ namespace OpenSim.Region.Framework.Scenes if (LocalId == remoteAvatar.LocalId) { - m_log.WarnFormat("[SP] An agent is attempting to send data to itself; {0}",UUID); + m_log.WarnFormat("[SCENEPRESENCE]: An agent is attempting to send data to itself; {0}", UUID); return; } if (IsChildAgent) { - m_log.WarnFormat("[SCENEPRESENCE] A child agent is attempting to send out avatar data"); + m_log.WarnFormat("[SCENEPRESENCE]: A child agent is attempting to send out avatar data; {0}", UUID); return; } @@ -2482,14 +2482,14 @@ namespace OpenSim.Region.Framework.Scenes { if (m_scene.AvatarFactory.ValidateBakedTextureCache(m_controllingClient)) { - m_log.WarnFormat("[SP] baked textures are in the ache for {0}",Name); +// m_log.WarnFormat("[SCENEPRESENCE]: baked textures are in the cache for {0}", Name); m_controllingClient.SendAppearance( m_appearance.Owner,m_appearance.VisualParams,m_appearance.Texture.GetBytes()); } } else { - m_log.WarnFormat("[SP] AvatarFactory not set"); + m_log.WarnFormat("[SCENEPRESENCE]: AvatarFactory not set for {0}", Name); } SendInitialFullUpdateToAllClients(); @@ -2501,7 +2501,7 @@ namespace OpenSim.Region.Framework.Scenes public void SendAppearanceToAllOtherAgents() { // DEBUG ON - m_log.WarnFormat("[SP] Send appearance from {0} to all other agents",m_uuid); +// m_log.WarnFormat("[SCENEPRESENCE]: Send appearance from {0} to all other agents", m_uuid); // DEBUG OFF m_perfMonMS = Util.EnvironmentTickCount();