OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* minor: doc and log message tweaking for wearables

0.6.0-stable
Justin Clarke Casey 2008-11-04 19:51:35 +00:00
parent 7d6dc3b099
commit 78bfe7a3e3
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs
View File

@ -151,6 +151,11 @@ namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory
} }
} }
/// <summary>
/// Update what the avatar is wearing using an item from their inventory.
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
public void AvatarIsWearing(Object sender, AvatarWearingArgs e) public void AvatarIsWearing(Object sender, AvatarWearingArgs e)
{ {
IClientAPI clientView = (IClientAPI)sender; IClientAPI clientView = (IClientAPI)sender;
@ -158,7 +163,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory
if (avatar == null) 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; return;
} }
@ -167,11 +172,11 @@ namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory
AvatarAppearance avatAppearance = null; AvatarAppearance avatAppearance = null;
if (!TryGetAvatarAppearance(clientView.AgentId, out avatAppearance)) 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; avatAppearance = avatar.Appearance;
} }
m_log.Info("[APPEARANCE]: Calling Avatar is Wearing"); m_log.DebugFormat("[APPEARANCE]: Received wearables for {0}", clientView.Name);
if (profile != null) if (profile != null)
{ {
@ -192,9 +197,15 @@ namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory
} }
else 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) public static void GetDefaultAvatarAppearance(out AvatarWearable[] wearables, out byte[] visualParams)