From e3efe1de16593fd74e4ac881969fa40e17c22d0b Mon Sep 17 00:00:00 2001
From: Sean Dague <sean@dague.net>
Date: Tue, 20 May 2008 22:37:18 +0000
Subject: [PATCH] attempt to fix mysql mapper usage

---
 .../Region/Modules/AvatarFactory/AvatarFactoryModule.cs   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
index 837a4ec5cf..37b7e8da55 100644
--- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
@@ -284,7 +284,12 @@ namespace OpenSim.Region.Modules.AvatarFactory
             IClientAPI clientView = (IClientAPI)sender;
             ScenePresence avatar = m_scene.GetScenePresence(clientView.AgentId);
             CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(clientView.AgentId);
-            AvatarAppearance avatAppearance = avatar.Appearance;
+
+            AvatarAppearance avatAppearance = null;
+            if(!TryGetAvatarAppearance(clientView.AgentId, out avatAppearance)) {
+                m_log.Info("We didn't seem to find the appearance");
+                avatAppearance = avatar.Appearance;
+            }
             m_log.Info("Calling Avatar is Wearing");
             if (profile != null)
             {
@@ -319,6 +324,7 @@ namespace OpenSim.Region.Modules.AvatarFactory
                         }
                     }
                     m_scene.CommsManager.UserService.UpdateUserAppearance(clientView.AgentId, avatAppearance);
+                    avatar.Appearance = avatAppearance;                    
                 }
                 else
                 {