diff options
author | Justin Clarke Casey | 2008-05-01 20:47:33 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-05-01 20:47:33 +0000 |
commit | 1de6cffa28348975a2492ce1e8a85c365df4dfaf (patch) | |
tree | 6431e5598defd603a4b2a8c5020b65d7df5a56a7 /OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | |
parent | create pass through of UserManagerBase to plugin calls (diff) | |
download | opensim-SC_OLD-1de6cffa28348975a2492ce1e8a85c365df4dfaf.zip opensim-SC_OLD-1de6cffa28348975a2492ce1e8a85c365df4dfaf.tar.gz opensim-SC_OLD-1de6cffa28348975a2492ce1e8a85c365df4dfaf.tar.bz2 opensim-SC_OLD-1de6cffa28348975a2492ce1e8a85c365df4dfaf.tar.xz |
* 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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | 13 |
1 files changed, 8 insertions, 5 deletions
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 | |||
181 | createdBaseFolder.ParentID = createdFolder.ParentID; | 181 | createdBaseFolder.ParentID = createdFolder.ParentID; |
182 | createdBaseFolder.Type = createdFolder.Type; | 182 | createdBaseFolder.Type = createdFolder.Type; |
183 | createdBaseFolder.Version = createdFolder.Version; | 183 | createdBaseFolder.Version = createdFolder.Version; |
184 | m_commsManager.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, createdBaseFolder); | 184 | |
185 | m_commsManager.InventoryService.AddFolder(createdBaseFolder); | ||
185 | } | 186 | } |
186 | else | 187 | else |
187 | { | 188 | { |
@@ -207,7 +208,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
207 | createdBaseFolder.Type = createdFolder.Type; | 208 | createdBaseFolder.Type = createdFolder.Type; |
208 | createdBaseFolder.Version = createdFolder.Version; | 209 | createdBaseFolder.Version = createdFolder.Version; |
209 | 210 | ||
210 | m_commsManager.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, createdBaseFolder); | 211 | m_commsManager.InventoryService.AddFolder(createdBaseFolder); |
211 | } | 212 | } |
212 | else | 213 | else |
213 | { | 214 | { |
@@ -265,7 +266,8 @@ namespace OpenSim.Framework.Communications.Cache | |||
265 | baseFolder.ParentID = parentID; | 266 | baseFolder.ParentID = parentID; |
266 | baseFolder.Type = (short) type; | 267 | baseFolder.Type = (short) type; |
267 | baseFolder.Version = userProfile.RootFolder.Version; | 268 | baseFolder.Version = userProfile.RootFolder.Version; |
268 | m_commsManager.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, baseFolder); | 269 | |
270 | m_commsManager.InventoryService.AddFolder(baseFolder); | ||
269 | } | 271 | } |
270 | else | 272 | else |
271 | { | 273 | { |
@@ -299,7 +301,8 @@ namespace OpenSim.Framework.Communications.Cache | |||
299 | baseFolder.Owner = remoteClient.AgentId; | 301 | baseFolder.Owner = remoteClient.AgentId; |
300 | baseFolder.ID = folderID; | 302 | baseFolder.ID = folderID; |
301 | baseFolder.ParentID = parentID; | 303 | baseFolder.ParentID = parentID; |
302 | m_commsManager.InventoryService.MoveInventoryFolder(remoteClient.AgentId, baseFolder); | 304 | |
305 | m_commsManager.InventoryService.MoveFolder(baseFolder); | ||
303 | } | 306 | } |
304 | else | 307 | else |
305 | { | 308 | { |
@@ -544,7 +547,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
544 | purgedBaseFolder.Type = purgedFolder.Type; | 547 | purgedBaseFolder.Type = purgedFolder.Type; |
545 | purgedBaseFolder.Version = purgedFolder.Version; | 548 | purgedBaseFolder.Version = purgedFolder.Version; |
546 | 549 | ||
547 | m_commsManager.InventoryService.PurgeInventoryFolder(remoteClient.AgentId, purgedBaseFolder); | 550 | m_commsManager.InventoryService.PurgeFolder(purgedBaseFolder); |
548 | 551 | ||
549 | purgedFolder.Purge(); | 552 | purgedFolder.Purge(); |
550 | } | 553 | } |