From 1de6cffa28348975a2492ce1e8a85c365df4dfaf Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Thu, 1 May 2008 20:47:33 +0000
Subject: * Refactor: Remove the unused userID parameter that was being passed
 into almost every inventory method * This allows lots of redundant inventory
 methods with only slightly different names to be eliminated.

---
 .../Communications/Cache/UserProfileCacheService.cs         | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs')

diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 392d796..befb6c7 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -181,7 +181,8 @@ namespace OpenSim.Framework.Communications.Cache
                             createdBaseFolder.ParentID = createdFolder.ParentID;
                             createdBaseFolder.Type = createdFolder.Type;
                             createdBaseFolder.Version = createdFolder.Version;
-                            m_commsManager.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, createdBaseFolder);
+                            
+                            m_commsManager.InventoryService.AddFolder(createdBaseFolder);
                         }
                         else
                         {
@@ -207,7 +208,7 @@ namespace OpenSim.Framework.Communications.Cache
                                 createdBaseFolder.Type = createdFolder.Type;
                                 createdBaseFolder.Version = createdFolder.Version;                            
                                 
-                                m_commsManager.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, createdBaseFolder);
+                                m_commsManager.InventoryService.AddFolder(createdBaseFolder);
                             }
                             else
                             {
@@ -265,7 +266,8 @@ namespace OpenSim.Framework.Communications.Cache
                     baseFolder.ParentID = parentID;
                     baseFolder.Type = (short) type;
                     baseFolder.Version = userProfile.RootFolder.Version;
-                    m_commsManager.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, baseFolder);
+                    
+                    m_commsManager.InventoryService.AddFolder(baseFolder);
                 }
                 else
                 {
@@ -299,7 +301,8 @@ namespace OpenSim.Framework.Communications.Cache
                     baseFolder.Owner = remoteClient.AgentId;
                     baseFolder.ID = folderID;
                     baseFolder.ParentID = parentID;
-                    m_commsManager.InventoryService.MoveInventoryFolder(remoteClient.AgentId, baseFolder);
+                    
+                    m_commsManager.InventoryService.MoveFolder(baseFolder);
                 }
                 else
                 {
@@ -544,7 +547,7 @@ namespace OpenSim.Framework.Communications.Cache
                         purgedBaseFolder.Type = purgedFolder.Type;
                         purgedBaseFolder.Version = purgedFolder.Version;                        
                         
-                        m_commsManager.InventoryService.PurgeInventoryFolder(remoteClient.AgentId, purgedBaseFolder);                                              
+                        m_commsManager.InventoryService.PurgeFolder(purgedBaseFolder);                                              
                         
                         purgedFolder.Purge();                        
                     }
-- 
cgit v1.1