From 7aa54593e0b6672979feec97b8151ed134388723 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 12 Aug 2009 20:39:48 -0700 Subject: 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. --- .../CoreModules/Avatar/Friends/FriendsModule.cs | 7 +- .../CoreModules/Avatar/Gestures/GesturesModule.cs | 39 +++--- .../Inventory/Transfer/InventoryTransferModule.cs | 141 +++++++++------------ 3 files changed, 83 insertions(+), 104 deletions(-) (limited to 'OpenSim/Region/CoreModules/Avatar') diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index b6250a2..49b2b5c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs @@ -39,6 +39,7 @@ using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; +using OpenSim.Services.Interfaces; namespace OpenSim.Region.CoreModules.Avatar.Friends { @@ -654,8 +655,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends initiator.ControllingClient.SendAgentOnline(new UUID[] { fromAgentID }); // find the folder for the friend... - InventoryFolderImpl folder = - initiator.Scene.CommsManager.UserProfileCacheService.GetUserDetails(toAgentID).FindFolderForType((int)InventoryType.CallingCard); + //InventoryFolderImpl folder = + // initiator.Scene.CommsManager.UserProfileCacheService.GetUserDetails(toAgentID).FindFolderForType((int)InventoryType.CallingCard); + IInventoryService invService = initiator.Scene.InventoryService; + InventoryFolderBase folder = invService.GetFolderForType(toAgentID, AssetType.CallingCard); if (folder != null) { // ... and add the calling card diff --git a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs index 102feaf..e61648c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs @@ -33,6 +33,7 @@ using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; +using OpenSim.Services.Interfaces; namespace OpenSim.Region.CoreModules.Avatar.Gestures { @@ -62,42 +63,32 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures public virtual void ActivateGesture(IClientAPI client, UUID assetId, UUID gestureId) { - CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(client.AgentId); + IInventoryService invService = m_scene.InventoryService; - if (userInfo != null) + InventoryItemBase item = invService.QueryItem(new InventoryItemBase(gestureId)); + if (item != null) { - InventoryItemBase item = userInfo.RootFolder.FindItem(gestureId); - if (item != null) - { - item.Flags = 1; - userInfo.UpdateItem(item); - } - else - m_log.ErrorFormat( - "[GESTURES]: Unable to find gesture to activate {0} for {1}", gestureId, client.Name); + item.Flags = 1; + invService.UpdateItem(item); } else - m_log.ErrorFormat("[GESTURES]: Unable to find user {0}", client.Name); + m_log.WarnFormat( + "[GESTURES]: Unable to find gesture {0} to activate for {1}", gestureId, client.Name); } public virtual void DeactivateGesture(IClientAPI client, UUID gestureId) { - CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(client.AgentId); + IInventoryService invService = m_scene.InventoryService; - if (userInfo != null) + InventoryItemBase item = invService.QueryItem(new InventoryItemBase(gestureId)); + if (item != null) { - InventoryItemBase item = userInfo.RootFolder.FindItem(gestureId); - if (item != null) - { - item.Flags = 0; - userInfo.UpdateItem(item); - } - else - m_log.ErrorFormat( - "[GESTURES]: Unable to find gesture to deactivate {0} for {1}", gestureId, client.Name); + item.Flags = 0; + invService.UpdateItem(item); } else - m_log.ErrorFormat("[GESTURES]: Unable to find user {0}", client.Name); + m_log.ErrorFormat( + "[GESTURES]: Unable to find gesture to deactivate {0} for {1}", gestureId, client.Name); } } } \ No newline at end of file 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; using OpenSim.Framework.Communications.Cache; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; +using OpenSim.Services.Interfaces; namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer { @@ -154,7 +155,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer "into agent {1}'s inventory", folderID, new UUID(im.toAgentID)); - InventoryFolderImpl folderCopy + InventoryFolderBase folderCopy = scene.GiveInventoryFolder(new UUID(im.toAgentID), client.AgentId, folderID, UUID.Zero); if (folderCopy == null) @@ -247,52 +248,51 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer // It will have been pushed to the client, too // - CachedUserInfo userInfo = - scene.CommsManager.UserProfileCacheService. - GetUserDetails(client.AgentId); + //CachedUserInfo userInfo = + // scene.CommsManager.UserProfileCacheService. + // GetUserDetails(client.AgentId); + IInventoryService invService = scene.InventoryService; - if (userInfo != null) - { - InventoryFolderImpl trashFolder = - userInfo.FindFolderForType((int)AssetType.TrashFolder); - - UUID inventoryEntityID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip - - InventoryItemBase item = userInfo.RootFolder.FindItem(inventoryEntityID); - InventoryFolderBase folder = null; + InventoryFolderBase trashFolder = + invService.GetFolderForType(client.AgentId, AssetType.TrashFolder); + + UUID inventoryEntityID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip - if (item != null && trashFolder != null) - { - item.Folder = trashFolder.ID; - - userInfo.DeleteItem(inventoryEntityID); + InventoryItemBase item = invService.QueryItem(new InventoryItemBase(inventoryEntityID)); + InventoryFolderBase folder = null; + + if (item != null && trashFolder != null) + { + item.Folder = trashFolder.ID; - scene.AddInventoryItem(client, item); - } - else + // Diva comment: can't we just update this item??? + invService.DeleteItem(item); + scene.AddInventoryItem(client, item); + } + else + { + folder = invService.QueryFolder(new InventoryFolderBase(inventoryEntityID)); + + if (folder != null & trashFolder != null) { - folder = userInfo.RootFolder.FindFolder(inventoryEntityID); - - if (folder != null & trashFolder != null) - { - userInfo.MoveFolder(inventoryEntityID, trashFolder.ID); - } + folder.ParentID = trashFolder.ID; + invService.MoveFolder(folder); } + } + + if ((null == item && null == folder) | null == trashFolder) + { + string reason = String.Empty; - if ((null == item && null == folder) | null == trashFolder) - { - string reason = String.Empty; - - if (trashFolder == null) - reason += " Trash folder not found."; - if (item == null) - reason += " Item not found."; - if (folder == null) - reason += " Folder not found."; - - client.SendAgentAlertMessage("Unable to delete "+ - "received inventory" + reason, false); - } + if (trashFolder == null) + reason += " Trash folder not found."; + if (item == null) + reason += " Item not found."; + if (folder == null) + reason += " Folder not found."; + + client.SendAgentAlertMessage("Unable to delete "+ + "received inventory" + reason, false); } ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID)); @@ -405,17 +405,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer return; } - CachedUserInfo userInfo = - scene.CommsManager.UserProfileCacheService. - GetUserDetails(user.ControllingClient.AgentId); + //CachedUserInfo userInfo = + // scene.CommsManager.UserProfileCacheService. + // GetUserDetails(user.ControllingClient.AgentId); - if (userInfo == null) - { - m_log.Debug("[INVENTORY TRANSFER] Can't find user info of recipient"); - return; - } + //if (userInfo == null) + //{ + // m_log.Debug("[INVENTORY TRANSFER] Can't find user info of recipient"); + // return; + //} AssetType assetType = (AssetType)msg.binaryBucket[0]; + IInventoryService invService = scene.InventoryService; if (AssetType.Folder == assetType) { @@ -425,31 +426,23 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer folder.ID = folderID; folder.Owner = user.ControllingClient.AgentId; - // Fetch from database + // Fetch from service // - if (!userInfo.QueryFolder(folder)) + folder = invService.QueryFolder(folder); + if (folder == null) { m_log.Debug("[INVENTORY TRANSFER] Can't find folder to give"); return; } - // Get folder info - // - InventoryFolderImpl folderInfo = userInfo.RootFolder.FindFolder(folder.ID); - if (folderInfo == null) - { - m_log.Debug("[INVENTORY TRANSFER] Can't retrieve folder to give"); - return; - } - - user.ControllingClient.SendBulkUpdateInventory(folderInfo); + user.ControllingClient.SendBulkUpdateInventory(folder); - // This unelegant, slow kludge is to reload the folders and - // items. Since a folder give can transfer subfolders and - // items, this is the easiest way to pull that stuff in - // - userInfo.DropInventory(); - userInfo.FetchInventory(); + //// This unelegant, slow kludge is to reload the folders and + //// items. Since a folder give can transfer subfolders and + //// items, this is the easiest way to pull that stuff in + //// + //userInfo.DropInventory(); + //userInfo.FetchInventory(); // Deliver message // @@ -463,20 +456,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer item.ID = itemID; item.Owner = user.ControllingClient.AgentId; - // Fetch from database - // - if (!userInfo.QueryItem(item)) - { - m_log.Debug("[INVENTORY TRANSFER] Can't find item to give"); - return; - } - - // Get item info + // Fetch from service // - item = userInfo.RootFolder.FindItem(item.ID); + item = invService.QueryItem(item); if (item == null) { - m_log.Debug("[INVENTORY TRANSFER] Can't retrieve item to give"); + m_log.Debug("[INVENTORY TRANSFER] Can't find item to give"); return; } -- cgit v1.1