From 1e1b2ab221851efc414678b7ea52ef2ca788ce9f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 10 Jan 2010 10:40:07 -0800
Subject: * OMG! All but one references to UserProfileCacheService have been
 rerouted! * HG is seriously broken here * Compiles. Untested.

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 1c5c247..476873a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -744,13 +744,9 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (transactionID == UUID.Zero)
             {
-                CachedUserInfo userInfo
-                    = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
-
-                if (userInfo != null)
+                ScenePresence presence;
+                if (TryGetAvatar(remoteClient.AgentId, out presence))
                 {
-                    ScenePresence presence;
-                    TryGetAvatar(remoteClient.AgentId, out presence);
                     byte[] data = null;
 
                     if (invType == (sbyte)InventoryType.Landmark && presence != null)
@@ -772,7 +768,7 @@ namespace OpenSim.Region.Framework.Scenes
                 else
                 {
                     m_log.ErrorFormat(
-                        "userInfo for agent uuid {0} unexpectedly null in CreateNewInventoryItem",
+                        "ScenePresence for agent uuid {0} unexpectedly not found in CreateNewInventoryItem",
                         remoteClient.AgentId);
                 }
             }
-- 
cgit v1.1