diff options
Redirected all calls to CachedUserProfile methods to the inventory service. Redirection of the RootFolder property is still todo. This compiles but probably inventory will be inconsistent.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | 141 |
1 files changed, 63 insertions, 78 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index 811d4cc..b5650fd 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -35,6 +35,7 @@ using OpenSim.Framework; | |||
35 | using OpenSim.Framework.Communications.Cache; | 35 | using OpenSim.Framework.Communications.Cache; |
36 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
37 | using OpenSim.Region.Framework.Scenes; | 37 | using OpenSim.Region.Framework.Scenes; |
38 | using OpenSim.Services.Interfaces; | ||
38 | 39 | ||
39 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | 40 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer |
40 | { | 41 | { |
@@ -154,7 +155,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
154 | "into agent {1}'s inventory", | 155 | "into agent {1}'s inventory", |
155 | folderID, new UUID(im.toAgentID)); | 156 | folderID, new UUID(im.toAgentID)); |
156 | 157 | ||
157 | InventoryFolderImpl folderCopy | 158 | InventoryFolderBase folderCopy |
158 | = scene.GiveInventoryFolder(new UUID(im.toAgentID), client.AgentId, folderID, UUID.Zero); | 159 | = scene.GiveInventoryFolder(new UUID(im.toAgentID), client.AgentId, folderID, UUID.Zero); |
159 | 160 | ||
160 | if (folderCopy == null) | 161 | if (folderCopy == null) |
@@ -247,52 +248,51 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
247 | // It will have been pushed to the client, too | 248 | // It will have been pushed to the client, too |
248 | // | 249 | // |
249 | 250 | ||
250 | CachedUserInfo userInfo = | 251 | //CachedUserInfo userInfo = |
251 | scene.CommsManager.UserProfileCacheService. | 252 | // scene.CommsManager.UserProfileCacheService. |
252 | GetUserDetails(client.AgentId); | 253 | // GetUserDetails(client.AgentId); |
254 | IInventoryService invService = scene.InventoryService; | ||
253 | 255 | ||
254 | if (userInfo != null) | 256 | InventoryFolderBase trashFolder = |
255 | { | 257 | invService.GetFolderForType(client.AgentId, AssetType.TrashFolder); |
256 | InventoryFolderImpl trashFolder = | 258 | |
257 | userInfo.FindFolderForType((int)AssetType.TrashFolder); | 259 | UUID inventoryEntityID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip |
258 | |||
259 | UUID inventoryEntityID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip | ||
260 | |||
261 | InventoryItemBase item = userInfo.RootFolder.FindItem(inventoryEntityID); | ||
262 | InventoryFolderBase folder = null; | ||
263 | 260 | ||
264 | if (item != null && trashFolder != null) | 261 | InventoryItemBase item = invService.QueryItem(new InventoryItemBase(inventoryEntityID)); |
265 | { | 262 | InventoryFolderBase folder = null; |
266 | item.Folder = trashFolder.ID; | 263 | |
267 | 264 | if (item != null && trashFolder != null) | |
268 | userInfo.DeleteItem(inventoryEntityID); | 265 | { |
266 | item.Folder = trashFolder.ID; | ||
269 | 267 | ||
270 | scene.AddInventoryItem(client, item); | 268 | // Diva comment: can't we just update this item??? |
271 | } | 269 | invService.DeleteItem(item); |
272 | else | 270 | scene.AddInventoryItem(client, item); |
271 | } | ||
272 | else | ||
273 | { | ||
274 | folder = invService.QueryFolder(new InventoryFolderBase(inventoryEntityID)); | ||
275 | |||
276 | if (folder != null & trashFolder != null) | ||
273 | { | 277 | { |
274 | folder = userInfo.RootFolder.FindFolder(inventoryEntityID); | 278 | folder.ParentID = trashFolder.ID; |
275 | 279 | invService.MoveFolder(folder); | |
276 | if (folder != null & trashFolder != null) | ||
277 | { | ||
278 | userInfo.MoveFolder(inventoryEntityID, trashFolder.ID); | ||
279 | } | ||
280 | } | 280 | } |
281 | } | ||
282 | |||
283 | if ((null == item && null == folder) | null == trashFolder) | ||
284 | { | ||
285 | string reason = String.Empty; | ||
281 | 286 | ||
282 | if ((null == item && null == folder) | null == trashFolder) | 287 | if (trashFolder == null) |
283 | { | 288 | reason += " Trash folder not found."; |
284 | string reason = String.Empty; | 289 | if (item == null) |
285 | 290 | reason += " Item not found."; | |
286 | if (trashFolder == null) | 291 | if (folder == null) |
287 | reason += " Trash folder not found."; | 292 | reason += " Folder not found."; |
288 | if (item == null) | 293 | |
289 | reason += " Item not found."; | 294 | client.SendAgentAlertMessage("Unable to delete "+ |
290 | if (folder == null) | 295 | "received inventory" + reason, false); |
291 | reason += " Folder not found."; | ||
292 | |||
293 | client.SendAgentAlertMessage("Unable to delete "+ | ||
294 | "received inventory" + reason, false); | ||
295 | } | ||
296 | } | 296 | } |
297 | 297 | ||
298 | ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID)); | 298 | ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID)); |
@@ -405,17 +405,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
405 | return; | 405 | return; |
406 | } | 406 | } |
407 | 407 | ||
408 | CachedUserInfo userInfo = | 408 | //CachedUserInfo userInfo = |
409 | scene.CommsManager.UserProfileCacheService. | 409 | // scene.CommsManager.UserProfileCacheService. |
410 | GetUserDetails(user.ControllingClient.AgentId); | 410 | // GetUserDetails(user.ControllingClient.AgentId); |
411 | 411 | ||
412 | if (userInfo == null) | 412 | //if (userInfo == null) |
413 | { | 413 | //{ |
414 | m_log.Debug("[INVENTORY TRANSFER] Can't find user info of recipient"); | 414 | // m_log.Debug("[INVENTORY TRANSFER] Can't find user info of recipient"); |
415 | return; | 415 | // return; |
416 | } | 416 | //} |
417 | 417 | ||
418 | AssetType assetType = (AssetType)msg.binaryBucket[0]; | 418 | AssetType assetType = (AssetType)msg.binaryBucket[0]; |
419 | IInventoryService invService = scene.InventoryService; | ||
419 | 420 | ||
420 | if (AssetType.Folder == assetType) | 421 | if (AssetType.Folder == assetType) |
421 | { | 422 | { |
@@ -425,31 +426,23 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
425 | folder.ID = folderID; | 426 | folder.ID = folderID; |
426 | folder.Owner = user.ControllingClient.AgentId; | 427 | folder.Owner = user.ControllingClient.AgentId; |
427 | 428 | ||
428 | // Fetch from database | 429 | // Fetch from service |
429 | // | 430 | // |
430 | if (!userInfo.QueryFolder(folder)) | 431 | folder = invService.QueryFolder(folder); |
432 | if (folder == null) | ||
431 | { | 433 | { |
432 | m_log.Debug("[INVENTORY TRANSFER] Can't find folder to give"); | 434 | m_log.Debug("[INVENTORY TRANSFER] Can't find folder to give"); |
433 | return; | 435 | return; |
434 | } | 436 | } |
435 | 437 | ||
436 | // Get folder info | 438 | user.ControllingClient.SendBulkUpdateInventory(folder); |
437 | // | ||
438 | InventoryFolderImpl folderInfo = userInfo.RootFolder.FindFolder(folder.ID); | ||
439 | if (folderInfo == null) | ||
440 | { | ||
441 | m_log.Debug("[INVENTORY TRANSFER] Can't retrieve folder to give"); | ||
442 | return; | ||
443 | } | ||
444 | |||
445 | user.ControllingClient.SendBulkUpdateInventory(folderInfo); | ||
446 | 439 | ||
447 | // This unelegant, slow kludge is to reload the folders and | 440 | //// This unelegant, slow kludge is to reload the folders and |
448 | // items. Since a folder give can transfer subfolders and | 441 | //// items. Since a folder give can transfer subfolders and |
449 | // items, this is the easiest way to pull that stuff in | 442 | //// items, this is the easiest way to pull that stuff in |
450 | // | 443 | //// |
451 | userInfo.DropInventory(); | 444 | //userInfo.DropInventory(); |
452 | userInfo.FetchInventory(); | 445 | //userInfo.FetchInventory(); |
453 | 446 | ||
454 | // Deliver message | 447 | // Deliver message |
455 | // | 448 | // |
@@ -463,20 +456,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
463 | item.ID = itemID; | 456 | item.ID = itemID; |
464 | item.Owner = user.ControllingClient.AgentId; | 457 | item.Owner = user.ControllingClient.AgentId; |
465 | 458 | ||
466 | // Fetch from database | 459 | // Fetch from service |
467 | // | ||
468 | if (!userInfo.QueryItem(item)) | ||
469 | { | ||
470 | m_log.Debug("[INVENTORY TRANSFER] Can't find item to give"); | ||
471 | return; | ||
472 | } | ||
473 | |||
474 | // Get item info | ||
475 | // | 460 | // |
476 | item = userInfo.RootFolder.FindItem(item.ID); | 461 | item = invService.QueryItem(item); |
477 | if (item == null) | 462 | if (item == null) |
478 | { | 463 | { |
479 | m_log.Debug("[INVENTORY TRANSFER] Can't retrieve item to give"); | 464 | m_log.Debug("[INVENTORY TRANSFER] Can't find item to give"); |
480 | return; | 465 | return; |
481 | } | 466 | } |
482 | 467 | ||