Inventory redirects from CachedUserInfo to InventoryService COMPLETE!

1 files changed, 25 insertions, 25 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
index 4224198..5d65f98 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
@@ -201,31 +201,31 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
             }
         }
 
-        public InventoryItemBase Get(InventoryItemBase item, UUID rootFolder, CachedUserInfo userInfo)
-        {
-            InventoryClient invCli = null;
-            string inventoryURL = UserInventoryURL(item.Owner);
-            if (!m_inventoryServers.TryGetValue(inventoryURL, out invCli))
-            {
-                m_log.Debug("[HGScene]: Starting new InventorytClient for " + inventoryURL);
-                invCli = new InventoryClient(inventoryURL);
-                m_inventoryServers.Add(inventoryURL, invCli);
-            }
-
-            item = invCli.GetInventoryItem(item);
-            if (item != null)
-            {
-                // Change the folder, stick it in root folder, all items flattened out here in this region cache
-                item.Folder = rootFolder;
-                //userInfo.AddItem(item); don't use this, it calls back to the inventory server
-                lock (userInfo.RootFolder.Items)
-                {
-                    userInfo.RootFolder.Items[item.ID] = item;
-                }
-
-            }
-            return item;
-        }
+        //public InventoryItemBase Get(InventoryItemBase item, UUID rootFolder, CachedUserInfo userInfo)
+        //{
+        //    InventoryClient invCli = null;
+        //    string inventoryURL = UserInventoryURL(item.Owner);
+        //    if (!m_inventoryServers.TryGetValue(inventoryURL, out invCli))
+        //    {
+        //        m_log.Debug("[HGScene]: Starting new InventorytClient for " + inventoryURL);
+        //        invCli = new InventoryClient(inventoryURL);
+        //        m_inventoryServers.Add(inventoryURL, invCli);
+        //    }
+
+        //    item = invCli.GetInventoryItem(item);
+        //    if (item != null)
+        //    {
+        //        // Change the folder, stick it in root folder, all items flattened out here in this region cache
+        //        item.Folder = rootFolder;
+        //        //userInfo.AddItem(item); don't use this, it calls back to the inventory server
+        //        lock (userInfo.RootFolder.Items)
+        //        {
+        //            userInfo.RootFolder.Items[item.ID] = item;
+        //        }
+
+        //    }
+        //    return item;
+        //}
 
         public void Post(UUID assetID, UUID ownerID)
         {