From 6b9cc6c48d7b49cc4bce5dce4e66d7856a093b75 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 13 Aug 2009 11:30:29 -0700
Subject: Inventory redirects from CachedUserInfo to InventoryService COMPLETE!

---
 .../Avatar/AvatarFactory/AvatarFactoryModule.cs    | 45 ++++++++--------------
 1 file changed, 15 insertions(+), 30 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Avatar')

diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 33dc7a5..547f923 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -34,6 +34,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 {
@@ -115,9 +116,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         }
 
 
-        public void SetAppearanceAssets(CachedUserInfo profile, ref AvatarAppearance appearance)
+        public void SetAppearanceAssets(UUID userID, ref AvatarAppearance appearance)
         {
-            if (profile.RootFolder != null)
+            IInventoryService invService = m_scene.InventoryService;
+
+            if (invService.GetRootFolder(userID) != null)
             {
                 for (int i = 0; i < 13; i++)
                 {
@@ -127,7 +130,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                     }
                     else
                     {
-                        InventoryItemBase baseItem = profile.RootFolder.FindItem(appearance.Wearables[i].ItemID);
+                        InventoryItemBase baseItem = invService.QueryItem(new InventoryItemBase(appearance.Wearables[i].ItemID));
 
                         if (baseItem != null)
                         {
@@ -143,7 +146,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             }
             else
             {
-                m_log.Error("[APPEARANCE]: you have no inventory, appearance stuff isn't going to work");
+                m_log.WarnFormat("[APPEARANCE]: user {0} has no inventory, appearance isn't going to work", userID);
             }
         }
 
@@ -163,8 +166,6 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 return;
             }
 
-            CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(clientView.AgentId);
-
             AvatarAppearance avatAppearance = null;
             if (!TryGetAvatarAppearance(clientView.AgentId, out avatAppearance)) 
             {
@@ -174,34 +175,18 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             
             //m_log.DebugFormat("[APPEARANCE]: Received wearables for {0}", clientView.Name);
             
-            if (profile != null)
+            foreach (AvatarWearingArgs.Wearable wear in e.NowWearing)
             {
-                if (profile.RootFolder != null)
+                if (wear.Type < 13)
                 {
-                    foreach (AvatarWearingArgs.Wearable wear in e.NowWearing)
-                    {
-                        if (wear.Type < 13)
-                        {
-                            avatAppearance.Wearables[wear.Type].ItemID = wear.ItemID;
-                        }
-                    }
-                    
-                    SetAppearanceAssets(profile, ref avatAppearance);
-
-                    m_scene.CommsManager.AvatarService.UpdateUserAppearance(clientView.AgentId, avatAppearance);
-                    avatar.Appearance = avatAppearance;
-                }
-                else
-                {
-                    m_log.WarnFormat(
-                        "[APPEARANCE]: Inventory has not yet been received for {0}, cannot set wearables", 
-                        clientView.Name);
+                    avatAppearance.Wearables[wear.Type].ItemID = wear.ItemID;
                 }
             }
-            else
-            {
-                m_log.WarnFormat("[APPEARANCE]: Cannot set wearables for {0}, no user profile found", clientView.Name);
-            }
+            
+            SetAppearanceAssets(avatar.UUID, ref avatAppearance);
+
+            m_scene.CommsManager.AvatarService.UpdateUserAppearance(clientView.AgentId, avatAppearance);
+            avatar.Appearance = avatAppearance;
         }
 
         public static void GetDefaultAvatarAppearance(out AvatarWearable[] wearables, out byte[] visualParams)
-- 
cgit v1.1