From 78bfe7a3e35a3b0a316298bba2b5c57466620475 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Tue, 4 Nov 2008 19:51:35 +0000 Subject: * minor: doc and log message tweaking for wearables --- .../Avatar/AvatarFactory/AvatarFactoryModule.cs | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region/Environment/Modules') diff --git a/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs index 94c27a5..7dc613e 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs @@ -151,6 +151,11 @@ namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory } } + /// + /// Update what the avatar is wearing using an item from their inventory. + /// + /// + /// public void AvatarIsWearing(Object sender, AvatarWearingArgs e) { IClientAPI clientView = (IClientAPI)sender; @@ -158,7 +163,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory if (avatar == null) { - m_log.Warn("[APPEARANCE]: Avatar is child agent, ignoring AvatarIsWearing event"); + m_log.Error("[APPEARANCE]: Avatar is child agent, ignoring AvatarIsWearing event"); return; } @@ -167,11 +172,11 @@ namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory AvatarAppearance avatAppearance = null; if (!TryGetAvatarAppearance(clientView.AgentId, out avatAppearance)) { - m_log.Info("[APPEARANCE]: We didn't seem to find the appearance, falling back to ScenePresense"); + m_log.Info("[APPEARANCE]: We didn't seem to find the appearance, falling back to ScenePresence"); avatAppearance = avatar.Appearance; } - m_log.Info("[APPEARANCE]: Calling Avatar is Wearing"); + m_log.DebugFormat("[APPEARANCE]: Received wearables for {0}", clientView.Name); if (profile != null) { @@ -192,9 +197,15 @@ namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory } else { - m_log.Error("[APPEARANCE]: Root Profile is null, we can't set the appearance"); + m_log.WarnFormat( + "[APPEARANCE]: Inventory has not yet been received for {0}, cannot set wearables", + clientView.Name); } } + else + { + m_log.WarnFormat("[APPEARANCE]: Cannot set wearables for {0}, no user profile found", clientView.Name); + } } public static void GetDefaultAvatarAppearance(out AvatarWearable[] wearables, out byte[] visualParams) -- cgit v1.1