From 77e43f480154b0a950d9d5f54df5c225fc64e77a Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 11 Jan 2010 17:30:05 -0800
Subject: Fixed a couple of bugs with Appearance. Appearance is all good now.
---
.../Avatar/AvatarFactory/AvatarFactoryModule.cs | 17 ++++++++++-------
.../Avatar/LocalAvatarServiceConnector.cs | 10 +++++-----
2 files changed, 15 insertions(+), 12 deletions(-)
(limited to 'OpenSim/Region/CoreModules')
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 87d0b0d..c01d66a 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
//if ((profile != null) && (profile.RootFolder != null))
if (avatar != null)
{
- appearance = avatar.ToAvatarAppearance();
+ appearance = avatar.ToAvatarAppearance(avatarId);
return true;
}
@@ -153,6 +153,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
///
public void AvatarIsWearing(Object sender, AvatarWearingArgs e)
{
+ m_log.DebugFormat("[APPEARANCE]: AvatarIsWearing");
+
IClientAPI clientView = (IClientAPI)sender;
ScenePresence sp = m_scene.GetScenePresence(clientView.AgentId);
@@ -162,12 +164,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
return;
}
- AvatarAppearance avatAppearance = null;
- if (!TryGetAvatarAppearance(clientView.AgentId, out avatAppearance))
- {
- m_log.Warn("[APPEARANCE]: We didn't seem to find the appearance, falling back to ScenePresence");
- avatAppearance = sp.Appearance;
- }
+ AvatarAppearance avatAppearance = sp.Appearance;
+ //if (!TryGetAvatarAppearance(clientView.AgentId, out avatAppearance))
+ //{
+ // m_log.Warn("[APPEARANCE]: We didn't seem to find the appearance, falling back to ScenePresence");
+ // avatAppearance = sp.Appearance;
+ //}
//m_log.DebugFormat("[APPEARANCE]: Received wearables for {0}", clientView.Name);
@@ -194,6 +196,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
public void UpdateDatabase(UUID user, AvatarAppearance appearance)
{
+ m_log.DebugFormat("[APPEARANCE]: UpdateDatabase");
AvatarData adata = new AvatarData(appearance);
m_scene.AvatarService.SetAvatar(user, adata);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs
index 0c8ee61..47f19a3 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar
IConfig userConfig = source.Configs["AvatarService"];
if (userConfig == null)
{
- m_log.Error("[USER CONNECTOR]: AvatarService missing from OpenSim.ini");
+ m_log.Error("[AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini");
return;
}
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar
if (serviceDll == String.Empty)
{
- m_log.Error("[USER CONNECTOR]: No LocalServiceModule named in section AvatarService");
+ m_log.Error("[AVATAR CONNECTOR]: No LocalServiceModule named in section AvatarService");
return;
}
@@ -92,11 +92,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar
if (m_AvatarService == null)
{
- m_log.Error("[USER CONNECTOR]: Can't load user account service");
+ m_log.Error("[AVATAR CONNECTOR]: Can't load user account service");
return;
}
m_Enabled = true;
- m_log.Info("[USER CONNECTOR]: Local avatar connector enabled");
+ m_log.Info("[AVATAR CONNECTOR]: Local avatar connector enabled");
}
}
}
@@ -118,7 +118,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar
if (!m_Enabled)
return;
- scene.RegisterModuleInterface(m_AvatarService);
+ scene.RegisterModuleInterface(this);
}
public void RemoveRegion(Scene scene)
--
cgit v1.1