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. --- OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 1015 ++++++++------------ .../Framework/Scenes/Scene.PacketHandlers.cs | 27 +- OpenSim/Region/Framework/Scenes/Scene.cs | 96 +- OpenSim/Region/Framework/Scenes/SceneGraph.cs | 4 +- 4 files changed, 446 insertions(+), 696 deletions(-) (limited to 'OpenSim/Region/Framework') diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index facd301..80f71b3 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs @@ -80,17 +80,12 @@ namespace OpenSim.Region.Framework.Scenes public bool AddInventoryItemReturned(UUID AgentId, InventoryItemBase item) { - CachedUserInfo userInfo - = CommsManager.UserProfileCacheService.GetUserDetails(AgentId); - if (userInfo != null) - { - userInfo.AddItem(item); + if (InventoryService.AddItem(item)) return true; - } else { - m_log.ErrorFormat( - "[AGENT INVENTORY]: Agent was not found for add of item {1} {2}", item.Name, item.ID); + m_log.WarnFormat( + "[AGENT INVENTORY]: Unable to add item {1} to agent {2} inventory", item.Name, AgentId); return false; } @@ -98,13 +93,9 @@ namespace OpenSim.Region.Framework.Scenes public void AddInventoryItem(UUID AgentID, InventoryItemBase item) { - CachedUserInfo userInfo - = CommsManager.UserProfileCacheService.GetUserDetails(AgentID); - if (userInfo != null) + if (InventoryService.AddItem(item)) { - userInfo.AddItem(item); - int userlevel = 0; if (Permissions.IsGod(AgentID)) { @@ -120,8 +111,8 @@ namespace OpenSim.Region.Framework.Scenes } else { - m_log.ErrorFormat( - "[AGENT INVENTORY]: Agent {1} was not found for add of item {2} {3}", + m_log.WarnFormat( + "[AGENT INVENTORY]: Agent {1} could not add item {2} {3}", AgentID, item.Name, item.ID); return; @@ -136,20 +127,8 @@ namespace OpenSim.Region.Framework.Scenes /// in which the item is to be placed. public void AddInventoryItem(IClientAPI remoteClient, InventoryItemBase item) { - CachedUserInfo userInfo - = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); - - if (userInfo != null) - { - AddInventoryItem(remoteClient.AgentId, item); - remoteClient.SendInventoryItemCreateUpdate(item, 0); - } - else - { - m_log.ErrorFormat( - "[AGENT INVENTORY]: Could not resolve user {0} for adding an inventory item", - remoteClient.AgentId); - } + AddInventoryItem(remoteClient.AgentId, item); + remoteClient.SendInventoryItemCreateUpdate(item, 0); } /// @@ -161,47 +140,40 @@ namespace OpenSim.Region.Framework.Scenes /// public virtual UUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, UUID itemID, byte[] data) { - CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); - if (userInfo != null) + InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); + + if (item != null) { - if (userInfo.RootFolder != null) + if ((InventoryType)item.InvType == InventoryType.Notecard) { - InventoryItemBase item = userInfo.RootFolder.FindItem(itemID); - - if (item != null) + if (!Permissions.CanEditNotecard(itemID, UUID.Zero, remoteClient.AgentId)) { - if ((InventoryType)item.InvType == InventoryType.Notecard) - { - if (!Permissions.CanEditNotecard(itemID, UUID.Zero, remoteClient.AgentId)) - { - remoteClient.SendAgentAlertMessage("Insufficient permissions to edit notecard", false); - return UUID.Zero; - } + remoteClient.SendAgentAlertMessage("Insufficient permissions to edit notecard", false); + return UUID.Zero; + } - remoteClient.SendAgentAlertMessage("Notecard saved", false); - } - else if ((InventoryType)item.InvType == InventoryType.LSL) - { - if (!Permissions.CanEditScript(itemID, UUID.Zero, remoteClient.AgentId)) - { - remoteClient.SendAgentAlertMessage("Insufficient permissions to edit script", false); - return UUID.Zero; - } + remoteClient.SendAgentAlertMessage("Notecard saved", false); + } + else if ((InventoryType)item.InvType == InventoryType.LSL) + { + if (!Permissions.CanEditScript(itemID, UUID.Zero, remoteClient.AgentId)) + { + remoteClient.SendAgentAlertMessage("Insufficient permissions to edit script", false); + return UUID.Zero; + } - remoteClient.SendAgentAlertMessage("Script saved", false); - } + remoteClient.SendAgentAlertMessage("Script saved", false); + } - AssetBase asset = - CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data); - item.AssetID = asset.FullID; - AssetService.Store(asset); + AssetBase asset = + CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data); + item.AssetID = asset.FullID; + AssetService.Store(asset); - userInfo.UpdateItem(item); + InventoryService.UpdateItem(item); - // remoteClient.SendInventoryItemCreateUpdate(item); - return (asset.FullID); - } - } + // remoteClient.SendInventoryItemCreateUpdate(item); + return (asset.FullID); } else { @@ -343,63 +315,52 @@ namespace OpenSim.Region.Framework.Scenes public void UpdateInventoryItemAsset(IClientAPI remoteClient, UUID transactionID, UUID itemID, InventoryItemBase itemUpd) { - CachedUserInfo userInfo - = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); + InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); - if (userInfo != null && userInfo.RootFolder != null) + if (item != null) { - InventoryItemBase item = userInfo.RootFolder.FindItem(itemID); - - if (item != null) + if (UUID.Zero == transactionID) { - if (UUID.Zero == transactionID) - { - item.Name = itemUpd.Name; - item.Description = itemUpd.Description; - item.NextPermissions = itemUpd.NextPermissions; - item.CurrentPermissions |= 8; // Slam! - item.EveryOnePermissions = itemUpd.EveryOnePermissions; - item.GroupPermissions = itemUpd.GroupPermissions; - - item.GroupID = itemUpd.GroupID; - item.GroupOwned = itemUpd.GroupOwned; - item.CreationDate = itemUpd.CreationDate; - // The client sends zero if its newly created? - - if (itemUpd.CreationDate == 0) - item.CreationDate = Util.UnixTimeSinceEpoch(); - else - item.CreationDate = itemUpd.CreationDate; + item.Name = itemUpd.Name; + item.Description = itemUpd.Description; + item.NextPermissions = itemUpd.NextPermissions; + item.CurrentPermissions |= 8; // Slam! + item.EveryOnePermissions = itemUpd.EveryOnePermissions; + item.GroupPermissions = itemUpd.GroupPermissions; - // TODO: Check if folder changed and move item - //item.NextPermissions = itemUpd.Folder; - item.InvType = itemUpd.InvType; - item.SalePrice = itemUpd.SalePrice; - item.SaleType = itemUpd.SaleType; - item.Flags = itemUpd.Flags; + item.GroupID = itemUpd.GroupID; + item.GroupOwned = itemUpd.GroupOwned; + item.CreationDate = itemUpd.CreationDate; + // The client sends zero if its newly created? - userInfo.UpdateItem(item); - } + if (itemUpd.CreationDate == 0) + item.CreationDate = Util.UnixTimeSinceEpoch(); else - { - IAgentAssetTransactions agentTransactions = this.RequestModuleInterface(); - if (agentTransactions != null) - { - agentTransactions.HandleItemUpdateFromTransaction( - remoteClient, transactionID, item); - } - } + item.CreationDate = itemUpd.CreationDate; + + // TODO: Check if folder changed and move item + //item.NextPermissions = itemUpd.Folder; + item.InvType = itemUpd.InvType; + item.SalePrice = itemUpd.SalePrice; + item.SaleType = itemUpd.SaleType; + item.Flags = itemUpd.Flags; + + InventoryService.UpdateItem(item); } else { - m_log.Error( - "[AGENTINVENTORY]: Item ID " + itemID + " not found for an inventory item update."); + IAgentAssetTransactions agentTransactions = this.RequestModuleInterface(); + if (agentTransactions != null) + { + agentTransactions.HandleItemUpdateFromTransaction( + remoteClient, transactionID, item); + } } } else { m_log.Error( - "[AGENT INVENTORY]: Agent ID " + remoteClient.AgentId + " not found for an inventory item update."); + "[AGENTINVENTORY]: Item ID " + itemID + " not found for an inventory item update."); } } @@ -445,123 +406,85 @@ namespace OpenSim.Region.Framework.Scenes public virtual InventoryItemBase GiveInventoryItem( UUID recipient, UUID senderId, UUID itemId, UUID recipientFolderId) { - // Retrieve the item from the sender - CachedUserInfo senderUserInfo = CommsManager.UserProfileCacheService.GetUserDetails(senderId); - Console.WriteLine("Scene.Inventory.cs: GiveInventoryItem"); - if (senderUserInfo == null) - { - m_log.ErrorFormat( - "[AGENT INVENTORY]: Failed to find sending user {0} for item {1}", senderId, itemId); - - return null; - } + InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemId)); - if (senderUserInfo.RootFolder != null) + if ((item != null) && (item.Owner == senderId)) { - InventoryItemBase item = senderUserInfo.RootFolder.FindItem(itemId); - - if (item != null) + if (!Permissions.BypassPermissions()) { - if (!Permissions.BypassPermissions()) - { - if ((item.CurrentPermissions & (uint)PermissionMask.Transfer) == 0) - return null; - } + if ((item.CurrentPermissions & (uint)PermissionMask.Transfer) == 0) + return null; + } - CachedUserInfo recipientUserInfo - = CommsManager.UserProfileCacheService.GetUserDetails(recipient); + // Insert a copy of the item into the recipient + InventoryItemBase itemCopy = new InventoryItemBase(); + itemCopy.Owner = recipient; + itemCopy.CreatorId = item.CreatorId; + itemCopy.ID = UUID.Random(); + itemCopy.AssetID = item.AssetID; + itemCopy.Description = item.Description; + itemCopy.Name = item.Name; + itemCopy.AssetType = item.AssetType; + itemCopy.InvType = item.InvType; + itemCopy.Folder = recipientFolderId; - if (recipientUserInfo != null) + if (Permissions.PropagatePermissions()) + { + if (item.InvType == (int)InventoryType.Object) { - if (!recipientUserInfo.HasReceivedInventory) - recipientUserInfo.FetchInventory(); - - // Insert a copy of the item into the recipient - InventoryItemBase itemCopy = new InventoryItemBase(); - itemCopy.Owner = recipient; - itemCopy.CreatorId = item.CreatorId; - itemCopy.ID = UUID.Random(); - itemCopy.AssetID = item.AssetID; - itemCopy.Description = item.Description; - itemCopy.Name = item.Name; - itemCopy.AssetType = item.AssetType; - itemCopy.InvType = item.InvType; - itemCopy.Folder = recipientFolderId; - - if (Permissions.PropagatePermissions()) - { - if (item.InvType == (int)InventoryType.Object) - { - itemCopy.BasePermissions &= ~(uint)(PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer); - itemCopy.BasePermissions |= (item.CurrentPermissions & 7) << 13; - } - else - { - itemCopy.BasePermissions = item.BasePermissions & item.NextPermissions; - } - - itemCopy.CurrentPermissions = itemCopy.BasePermissions; - if ((item.CurrentPermissions & 8) != 0) // Propagate slam bit - { - itemCopy.BasePermissions &= item.NextPermissions; - itemCopy.CurrentPermissions = itemCopy.BasePermissions; - itemCopy.CurrentPermissions |= 8; - } - - itemCopy.NextPermissions = item.NextPermissions; - itemCopy.EveryOnePermissions = item.EveryOnePermissions & item.NextPermissions; - itemCopy.GroupPermissions = item.GroupPermissions & item.NextPermissions; - } - else - { - itemCopy.CurrentPermissions = item.CurrentPermissions; - itemCopy.NextPermissions = item.NextPermissions; - itemCopy.EveryOnePermissions = item.EveryOnePermissions & item.NextPermissions; - itemCopy.GroupPermissions = item.GroupPermissions & item.NextPermissions; - itemCopy.BasePermissions = item.BasePermissions; - } - - itemCopy.GroupID = UUID.Zero; - itemCopy.GroupOwned = false; - itemCopy.Flags = item.Flags; - itemCopy.SalePrice = item.SalePrice; - itemCopy.SaleType = item.SaleType; - - recipientUserInfo.AddItem(itemCopy); - - if (!Permissions.BypassPermissions()) - { - if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) - senderUserInfo.DeleteItem(itemId); - } - - return itemCopy; + itemCopy.BasePermissions &= ~(uint)(PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer); + itemCopy.BasePermissions |= (item.CurrentPermissions & 7) << 13; } else { - m_log.ErrorFormat( - "[AGENT INVENTORY]: Could not find userinfo for recipient user {0} of item {1}, {2} from {3}", - recipient, item.Name, - item.ID, senderId); + itemCopy.BasePermissions = item.BasePermissions & item.NextPermissions; } + + itemCopy.CurrentPermissions = itemCopy.BasePermissions; + if ((item.CurrentPermissions & 8) != 0) // Propagate slam bit + { + itemCopy.BasePermissions &= item.NextPermissions; + itemCopy.CurrentPermissions = itemCopy.BasePermissions; + itemCopy.CurrentPermissions |= 8; + } + + itemCopy.NextPermissions = item.NextPermissions; + itemCopy.EveryOnePermissions = item.EveryOnePermissions & item.NextPermissions; + itemCopy.GroupPermissions = item.GroupPermissions & item.NextPermissions; } else { - m_log.ErrorFormat( - "[AGENT INVENTORY]: Failed to find item {0} to give to {1}", itemId, senderId); + itemCopy.CurrentPermissions = item.CurrentPermissions; + itemCopy.NextPermissions = item.NextPermissions; + itemCopy.EveryOnePermissions = item.EveryOnePermissions & item.NextPermissions; + itemCopy.GroupPermissions = item.GroupPermissions & item.NextPermissions; + itemCopy.BasePermissions = item.BasePermissions; + } + + itemCopy.GroupID = UUID.Zero; + itemCopy.GroupOwned = false; + itemCopy.Flags = item.Flags; + itemCopy.SalePrice = item.SalePrice; + itemCopy.SaleType = item.SaleType; - return null; + InventoryService.AddItem(itemCopy); + + if (!Permissions.BypassPermissions()) + { + if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) + InventoryService.DeleteItem(new InventoryItemBase(itemId)); } + + return itemCopy; } else { - m_log.Error("[AGENT INVENTORY]: Failed to find item " + itemId.ToString() + ", no root folder"); + m_log.WarnFormat("[AGENT INVENTORY]: Failed to find item {0} or item does not belong to giver ", itemId); return null; } - return null; } /// @@ -578,31 +501,11 @@ namespace OpenSim.Region.Framework.Scenes /// /// The inventory folder copy given, null if the copy was unsuccessful /// - public virtual InventoryFolderImpl GiveInventoryFolder( + public virtual InventoryFolderBase GiveInventoryFolder( UUID recipientId, UUID senderId, UUID folderId, UUID recipientParentFolderId) { - // Retrieve the folder from the sender - CachedUserInfo senderUserInfo = CommsManager.UserProfileCacheService.GetUserDetails(senderId); - - if (null == senderUserInfo) - { - m_log.ErrorFormat( - "[AGENT INVENTORY]: Failed to find sending user {0} for folder {1}", senderId, folderId); - - return null; - } - - if (!senderUserInfo.HasReceivedInventory) - { - m_log.DebugFormat( - "[AGENT INVENTORY]: Could not give inventory folder - have not yet received inventory for {0}", - senderId); - - return null; - } - - InventoryFolderImpl folder = senderUserInfo.RootFolder.FindFolder(folderId); - + //// Retrieve the folder from the sender + InventoryFolderBase folder = InventoryService.QueryFolder(new InventoryFolderBase(folderId)); if (null == folder) { m_log.ErrorFormat( @@ -611,48 +514,37 @@ namespace OpenSim.Region.Framework.Scenes return null; } - CachedUserInfo recipientUserInfo - = CommsManager.UserProfileCacheService.GetUserDetails(recipientId); - - if (null == recipientUserInfo) - { - m_log.ErrorFormat( - "[AGENT INVENTORY]: Failed to find receiving user {0} for folder {1}", recipientId, folderId); - - return null; - } - if (!recipientUserInfo.HasReceivedInventory) + if (recipientParentFolderId == UUID.Zero) { - recipientUserInfo.FetchInventory(); - if (!WaitForInventory(recipientUserInfo)) + InventoryFolderBase recipientRootFolder = InventoryService.GetRootFolder(recipientId); + if (recipientRootFolder != null) + recipientParentFolderId = recipientRootFolder.ID; + else + { + m_log.WarnFormat("[AGENT INVENTORY]: Unable to find root folder for receiving agent"); return null; + } } - if (recipientParentFolderId == UUID.Zero) - recipientParentFolderId = recipientUserInfo.RootFolder.ID; - UUID newFolderId = UUID.Random(); - recipientUserInfo.CreateFolder(folder.Name, newFolderId, (ushort)folder.Type, recipientParentFolderId); - - // XXX: Messy - we should really get this back in the CreateFolder call - InventoryFolderImpl copiedFolder = recipientUserInfo.RootFolder.FindFolder(newFolderId); + InventoryFolderBase newFolder = new InventoryFolderBase(newFolderId, folder.Name, recipientId, folder.Type, recipientParentFolderId, folder.Version); + InventoryService.AddFolder(newFolder); // Give all the subfolders - List subFolders = folder.RequestListOfFolderImpls(); - foreach (InventoryFolderImpl childFolder in subFolders) + InventoryCollection contents = InventoryService.GetFolderContent(senderId, folderId); + foreach (InventoryFolderBase childFolder in contents.Folders) { - GiveInventoryFolder(recipientId, senderId, childFolder.ID, copiedFolder.ID); + GiveInventoryFolder(recipientId, senderId, childFolder.ID, newFolder.ID); } // Give all the items - List items = folder.RequestListOfItems(); - foreach (InventoryItemBase item in items) + foreach (InventoryItemBase item in contents.Items) { - GiveInventoryItem(recipientId, senderId, item.ID, copiedFolder.ID); + GiveInventoryItem(recipientId, senderId, item.ID, newFolder.ID); } - return copiedFolder; + return newFolder; } public void CopyInventoryItem(IClientAPI remoteClient, uint callbackID, UUID oldAgentID, UUID oldItemID, @@ -759,41 +651,24 @@ namespace OpenSim.Region.Framework.Scenes m_log.DebugFormat( "[AGENT INVENTORY]: Moving item {0} to {1} for {2}", itemID, folderID, remoteClient.AgentId); - CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); - - if (userInfo == null) - { - m_log.Error("[AGENT INVENTORY]: Failed to find user " + remoteClient.AgentId.ToString()); + InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); - return; - } - - if (userInfo.RootFolder != null) + if (item != null) { - InventoryItemBase item = userInfo.RootFolder.FindItem(itemID); - - if (item != null) + if (newName != String.Empty) { - if (newName != String.Empty) - { - item.Name = newName; - } - item.Folder = folderID; - - userInfo.DeleteItem(item.ID); - - AddInventoryItem(remoteClient, item); + item.Name = newName; } - else - { - m_log.Error("[AGENT INVENTORY]: Failed to find item " + itemID.ToString()); + item.Folder = folderID; - return; - } + // Diva comment: can't we just update? + InventoryService.DeleteItem(item); + + AddInventoryItem(remoteClient, item); } else { - m_log.Error("[AGENT INVENTORY]: Failed to find item " + itemID.ToString() + ", no root folder"); + m_log.Warn("[AGENT INVENTORY]: Failed to find item " + itemID.ToString()); return; } @@ -830,37 +705,32 @@ namespace OpenSim.Region.Framework.Scenes IClientAPI remoteClient, string creatorID, UUID folderID, string name, uint flags, uint callbackID, AssetBase asset, sbyte invType, uint baseMask, uint currentMask, uint everyoneMask, uint nextOwnerMask, uint groupMask, int creationDate) { - CachedUserInfo userInfo - = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); - - if (userInfo != null) - { - InventoryItemBase item = new InventoryItemBase(); - item.Owner = remoteClient.AgentId; - item.CreatorId = creatorID; - item.ID = UUID.Random(); - item.AssetID = asset.FullID; - item.Description = asset.Description; - item.Name = name; - item.Flags = flags; - item.AssetType = asset.Type; - item.InvType = invType; - item.Folder = folderID; - item.CurrentPermissions = currentMask; - item.NextPermissions = nextOwnerMask; - item.EveryOnePermissions = everyoneMask; - item.GroupPermissions = groupMask; - item.BasePermissions = baseMask; - item.CreationDate = creationDate; - - userInfo.AddItem(item); + InventoryItemBase item = new InventoryItemBase(); + item.Owner = remoteClient.AgentId; + item.CreatorId = creatorID; + item.ID = UUID.Random(); + item.AssetID = asset.FullID; + item.Description = asset.Description; + item.Name = name; + item.Flags = flags; + item.AssetType = asset.Type; + item.InvType = invType; + item.Folder = folderID; + item.CurrentPermissions = currentMask; + item.NextPermissions = nextOwnerMask; + item.EveryOnePermissions = everyoneMask; + item.GroupPermissions = groupMask; + item.BasePermissions = baseMask; + item.CreationDate = creationDate; + + if (InventoryService.AddItem(item)) remoteClient.SendInventoryItemCreateUpdate(item, callbackID); - } else { + m_dialogModule.SendAlertToUser(remoteClient, "Failed to create item"); m_log.WarnFormat( - "No user details associated with client {0} uuid {1} in CreateNewInventoryItem!", - remoteClient.Name, remoteClient.AgentId); + "Failed to add item for {0} in CreateNewInventoryItem!", + remoteClient.Name); } } @@ -941,19 +811,7 @@ namespace OpenSim.Region.Framework.Scenes /// private void RemoveInventoryItem(IClientAPI remoteClient, UUID itemID) { - CachedUserInfo userInfo - = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); - - if (userInfo == null) - { - m_log.WarnFormat( - "[AGENT INVENTORY]: Failed to find user {0} {1} to delete inventory item {2}", - remoteClient.Name, remoteClient.AgentId, itemID); - - return; - } - - userInfo.DeleteItem(itemID); + InventoryService.DeleteItem(new InventoryItemBase(itemID)); } /// @@ -1332,19 +1190,12 @@ namespace OpenSim.Region.Framework.Scenes public UUID MoveTaskInventoryItems(UUID destID, string category, SceneObjectPart host, List items) { - CachedUserInfo profile = CommsManager.UserProfileCacheService.GetUserDetails(destID); - if (profile == null || profile.RootFolder == null) - { - m_log.ErrorFormat( - "[PRIM INVENTORY]: " + - "Avatar {0} cannot be found to add items", - destID); - return UUID.Zero; - } + InventoryFolderBase rootFolder = InventoryService.GetRootFolder(destID); UUID newFolderID = UUID.Random(); - profile.CreateFolder(category, newFolderID, 0xffff, profile.RootFolder.ID); + InventoryFolderBase newFolder = new InventoryFolderBase(newFolderID, category, destID, 0xff, rootFolder.ID, rootFolder.Version); + InventoryService.AddFolder(newFolder); foreach (UUID itemID in items) { @@ -1358,19 +1209,27 @@ namespace OpenSim.Region.Framework.Scenes } } - ScenePresence avatar; - + ScenePresence avatar = null; if (TryGetAvatar(destID, out avatar)) { - profile.SendInventoryDecendents(avatar.ControllingClient, - profile.RootFolder.ID, true, false); - profile.SendInventoryDecendents(avatar.ControllingClient, - newFolderID, false, true); + //profile.SendInventoryDecendents(avatar.ControllingClient, + // profile.RootFolder.ID, true, false); + //profile.SendInventoryDecendents(avatar.ControllingClient, + // newFolderID, false, true); + + SendInventoryUpdate(avatar.ControllingClient, rootFolder, true, false); + SendInventoryUpdate(avatar.ControllingClient, newFolder, false, true); } return newFolderID; } + private void SendInventoryUpdate(IClientAPI client, InventoryFolderBase folder, bool fetchFolders, bool fetchItems) + { + InventoryCollection contents = InventoryService.GetFolderContent(client.AgentId, folder.ID); + client.SendInventoryFolderDetails(client.AgentId, folder.ID, contents.Items, contents.Folders, fetchFolders, fetchItems); + } + /// /// Update an item in a prim (task) inventory. /// This method does not handle scripts, RezScript(IClientAPI, UUID, unit) @@ -1848,7 +1707,7 @@ namespace OpenSim.Region.Framework.Scenes // Get the user info of the item destination // - CachedUserInfo userInfo; + UUID userID = UUID.Zero; if (action == DeRezAction.Take || action == DeRezAction.TakeCopy || action == DeRezAction.SaveToExistingUserInventoryItem) @@ -1859,28 +1718,19 @@ namespace OpenSim.Region.Framework.Scenes if (remoteClient == null) return UUID.Zero; - userInfo = CommsManager.UserProfileCacheService.GetUserDetails( - remoteClient.AgentId); + userID = remoteClient.AgentId; } else { // All returns / deletes go to the object owner // - userInfo = CommsManager.UserProfileCacheService.GetUserDetails( - objectGroup.RootPart.OwnerID); - } - if (userInfo == null) // Can't proceed - { - return UUID.Zero; + userID = objectGroup.RootPart.OwnerID; } - if (!userInfo.HasReceivedInventory) + if (userID == UUID.Zero) // Can't proceed { - // Async inventory requests will queue, but they will never - // execute unless inventory is actually fetched - // - userInfo.FetchInventory(); + return UUID.Zero; } // If we're returning someone's item, it goes back to the @@ -1894,8 +1744,11 @@ namespace OpenSim.Region.Framework.Scenes if (DeRezAction.SaveToExistingUserInventoryItem == action) { - item = userInfo.RootFolder.FindItem( - objectGroup.RootPart.FromUserInventoryItemID); + item = new InventoryItemBase(objectGroup.RootPart.FromUserInventoryItemID); + item = InventoryService.QueryItem(item); + + //item = userInfo.RootFolder.FindItem( + // objectGroup.RootPart.FromUserInventoryItemID); if (null == item) { @@ -1920,53 +1773,36 @@ namespace OpenSim.Region.Framework.Scenes // have to wait for the inventory to find // the destination folder // - if (!WaitForInventory(userInfo)) - return UUID.Zero; - folder = userInfo.FindFolderForType( - (int)AssetType.LostAndFoundFolder); + folder = InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder); } else { // Assume inventory skeleton was loaded during login // and all folders can be found // - folder = userInfo.FindFolderForType( - (int)AssetType.TrashFolder); + folder = InventoryService.GetFolderForType(userID, AssetType.TrashFolder); } } else if (action == DeRezAction.Return) { - // Wait if needed - // - if (!userInfo.HasReceivedInventory) - { - if (!WaitForInventory(userInfo)) - return UUID.Zero; - } // Dump to lost + found unconditionally // - folder = userInfo.FindFolderForType( - (int)AssetType.LostAndFoundFolder); + folder = InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder); } if (folderID == UUID.Zero && folder == null) { // Catch all. Use lost & found // - if (!userInfo.HasReceivedInventory) - { - if (!WaitForInventory(userInfo)) - return UUID.Zero; - } - folder = userInfo.FindFolderForType( - (int)AssetType.LostAndFoundFolder); + folder = InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder); } if (folder == null) // None of the above { - folder = userInfo.RootFolder.FindFolder(folderID); + //folder = userInfo.RootFolder.FindFolder(folderID); + folder = new InventoryFolderBase(folderID); if (folder == null) // Nowhere to put it { @@ -1979,7 +1815,7 @@ namespace OpenSim.Region.Framework.Scenes item.ID = UUID.Random(); item.InvType = (int)InventoryType.Object; item.Folder = folder.ID; - item.Owner = userInfo.UserProfile.ID; + item.Owner = userID; } AssetBase asset = CreateAsset( @@ -1993,7 +1829,7 @@ namespace OpenSim.Region.Framework.Scenes if (DeRezAction.SaveToExistingUserInventoryItem == action) { item.AssetID = asset.FullID; - userInfo.UpdateItem(item); + InventoryService.UpdateItem(item); } else { @@ -2034,7 +1870,7 @@ namespace OpenSim.Region.Framework.Scenes item.Name = asset.Name; item.AssetType = asset.Type; - userInfo.AddItem(item); + InventoryService.AddItem(item); if (remoteClient != null && item.Owner == remoteClient.AgentId) { @@ -2053,7 +1889,7 @@ namespace OpenSim.Region.Framework.Scenes return assetID; } - public void updateKnownAsset(IClientAPI remoteClient, SceneObjectGroup grp, UUID assetID, UUID agentID) + public void UpdateKnownItem(IClientAPI remoteClient, SceneObjectGroup grp, UUID itemID, UUID agentID) { SceneObjectGroup objectGroup = grp; if (objectGroup != null) @@ -2070,65 +1906,29 @@ namespace OpenSim.Region.Framework.Scenes string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(objectGroup); - CachedUserInfo userInfo = - CommsManager.UserProfileCacheService.GetUserDetails(agentID); - if (userInfo != null && userInfo.RootFolder != null) + InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); + + if (item != null) { - Queue searchfolders = new Queue(); - searchfolders.Enqueue(userInfo.RootFolder); + AssetBase asset = CreateAsset( + objectGroup.GetPartName(objectGroup.LocalId), + objectGroup.GetPartDescription(objectGroup.LocalId), + (sbyte)AssetType.Object, + Utils.StringToBytes(sceneObjectXml)); + AssetService.Store(asset); - UUID foundFolder = UUID.Zero; - InventoryItemBase item = null; + item.AssetID = asset.FullID; + item.Description = asset.Description; + item.Name = asset.Name; + item.AssetType = asset.Type; + item.InvType = (int)InventoryType.Object; - // search through folders to find the asset. - while (searchfolders.Count > 0) - { - InventoryFolderImpl fld = searchfolders.Dequeue(); - lock (fld) - { - if (fld != null) - { - if (fld.Items.ContainsKey(assetID)) - { - item = fld.Items[assetID]; - foundFolder = fld.ID; - searchfolders.Clear(); - break; - } - else - { - foreach (InventoryFolderImpl subfld in fld.RequestListOfFolderImpls()) - { - searchfolders.Enqueue(subfld); - } - } - } - } - } + InventoryService.UpdateItem(item); - if (foundFolder != UUID.Zero && item != null) + // this gets called when the agent loggs off! + if (remoteClient != null) { - AssetBase asset = CreateAsset( - objectGroup.GetPartName(objectGroup.LocalId), - objectGroup.GetPartDescription(objectGroup.LocalId), - (sbyte)AssetType.Object, - Utils.StringToBytes(sceneObjectXml)); - AssetService.Store(asset); - - item.AssetID = asset.FullID; - item.Description = asset.Description; - item.Name = asset.Name; - item.AssetType = asset.Type; - item.InvType = (int)InventoryType.Object; - item.Folder = foundFolder; - - userInfo.UpdateItem(item); - - // this gets called when the agent loggs off! - if (remoteClient != null) - { - remoteClient.SendInventoryItemCreateUpdate(item, 0); - } + remoteClient.SendInventoryItemCreateUpdate(item, 0); } } } @@ -2140,59 +1940,54 @@ namespace OpenSim.Region.Framework.Scenes if (grp != null) { string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp); + + AssetBase asset = CreateAsset( + grp.GetPartName(grp.LocalId), + grp.GetPartDescription(grp.LocalId), + (sbyte)AssetType.Object, + Utils.StringToBytes(sceneObjectXml)); + AssetService.Store(asset); - CachedUserInfo userInfo = - CommsManager.UserProfileCacheService.GetUserDetails(AgentId); - - if (userInfo != null) - { - AssetBase asset = CreateAsset( - grp.GetPartName(grp.LocalId), - grp.GetPartDescription(grp.LocalId), - (sbyte)AssetType.Object, - Utils.StringToBytes(sceneObjectXml)); - AssetService.Store(asset); - - InventoryItemBase item = new InventoryItemBase(); - item.CreatorId = grp.RootPart.CreatorID.ToString(); - item.Owner = remoteClient.AgentId; - item.ID = UUID.Random(); - item.AssetID = asset.FullID; - item.Description = asset.Description; - item.Name = asset.Name; - item.AssetType = asset.Type; - item.InvType = (int)InventoryType.Object; + InventoryItemBase item = new InventoryItemBase(); + item.CreatorId = grp.RootPart.CreatorID.ToString(); + item.Owner = remoteClient.AgentId; + item.ID = UUID.Random(); + item.AssetID = asset.FullID; + item.Description = asset.Description; + item.Name = asset.Name; + item.AssetType = asset.Type; + item.InvType = (int)InventoryType.Object; - item.Folder = UUID.Zero; // Objects folder! + item.Folder = UUID.Zero; // Objects folder! - if ((remoteClient.AgentId != grp.RootPart.OwnerID) && Permissions.PropagatePermissions()) - { - item.BasePermissions = grp.RootPart.NextOwnerMask; - item.CurrentPermissions = grp.RootPart.NextOwnerMask; - item.NextPermissions = grp.RootPart.NextOwnerMask; - item.EveryOnePermissions = grp.RootPart.EveryoneMask & grp.RootPart.NextOwnerMask; - item.GroupPermissions = grp.RootPart.GroupMask & grp.RootPart.NextOwnerMask; - } - else - { - item.BasePermissions = grp.RootPart.BaseMask; - item.CurrentPermissions = grp.RootPart.OwnerMask; - item.NextPermissions = grp.RootPart.NextOwnerMask; - item.EveryOnePermissions = grp.RootPart.EveryoneMask; - item.GroupPermissions = grp.RootPart.GroupMask; - } - item.CreationDate = Util.UnixTimeSinceEpoch(); + if ((remoteClient.AgentId != grp.RootPart.OwnerID) && Permissions.PropagatePermissions()) + { + item.BasePermissions = grp.RootPart.NextOwnerMask; + item.CurrentPermissions = grp.RootPart.NextOwnerMask; + item.NextPermissions = grp.RootPart.NextOwnerMask; + item.EveryOnePermissions = grp.RootPart.EveryoneMask & grp.RootPart.NextOwnerMask; + item.GroupPermissions = grp.RootPart.GroupMask & grp.RootPart.NextOwnerMask; + } + else + { + item.BasePermissions = grp.RootPart.BaseMask; + item.CurrentPermissions = grp.RootPart.OwnerMask; + item.NextPermissions = grp.RootPart.NextOwnerMask; + item.EveryOnePermissions = grp.RootPart.EveryoneMask; + item.GroupPermissions = grp.RootPart.GroupMask; + } + item.CreationDate = Util.UnixTimeSinceEpoch(); - // sets assetID so client can show asset as 'attached' in inventory - grp.SetFromAssetID(item.ID); + // sets assetID so client can show asset as 'attached' in inventory + grp.SetFromAssetID(item.ID); - userInfo.AddItem(item); + if (InventoryService.AddItem(item)) remoteClient.SendInventoryItemCreateUpdate(item, 0); + else + m_dialogModule.SendAlertToUser(remoteClient, "Operation failed"); - itemID = item.ID; - return item.AssetID; - } - return UUID.Zero; + itemID = item.ID; + return item.AssetID; } return UUID.Zero; } @@ -2261,180 +2056,164 @@ namespace OpenSim.Region.Framework.Scenes BypassRayCast, bRayEndIsIntersection,true,scale, false); // Rez object - CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); - if (userInfo != null) + InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); + + if (item != null) { - // Do NOT use HasReceivedInventory here, this is called - // from within ItemReceive during login for attachments. - // Using HasReceivedInventory here will break attachment - // persistence! - // - if (userInfo.RootFolder != null) + AssetBase rezAsset = AssetService.Get(item.AssetID.ToString()); + + if (rezAsset != null) { - InventoryItemBase item = userInfo.RootFolder.FindItem(itemID); + UUID itemId = UUID.Zero; - if (item != null) + // If we have permission to copy then link the rezzed object back to the user inventory + // item that it came from. This allows us to enable 'save object to inventory' + if (!Permissions.BypassPermissions()) { - AssetBase rezAsset = AssetService.Get(item.AssetID.ToString()); - - if (rezAsset != null) + if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == (uint)PermissionMask.Copy) { - UUID itemId = UUID.Zero; - - // If we have permission to copy then link the rezzed object back to the user inventory - // item that it came from. This allows us to enable 'save object to inventory' - if (!Permissions.BypassPermissions()) - { - if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == (uint)PermissionMask.Copy) - { - itemId = item.ID; - } - } - else - { - // Brave new fullperm world - // - itemId = item.ID; - } - - string xmlData = Utils.BytesToString(rezAsset.Data); - SceneObjectGroup group - = SceneObjectSerializer.FromOriginalXmlFormat(itemId, xmlData); + itemId = item.ID; + } + } + else + { + // Brave new fullperm world + // + itemId = item.ID; + } - if (!Permissions.CanRezObject( - group.Children.Count, remoteClient.AgentId, pos) - && !attachment) - { - return null; - } + string xmlData = Utils.BytesToString(rezAsset.Data); + SceneObjectGroup group + = SceneObjectSerializer.FromOriginalXmlFormat(itemId, xmlData); - group.ResetIDs(); + if (!Permissions.CanRezObject( + group.Children.Count, remoteClient.AgentId, pos) + && !attachment) + { + return null; + } - if (attachment) - group.RootPart.ObjectFlags |= (uint)PrimFlags.Phantom; + group.ResetIDs(); - AddNewSceneObject(group, true); + if (attachment) + group.RootPart.ObjectFlags |= (uint)PrimFlags.Phantom; - // m_log.InfoFormat("ray end point for inventory rezz is {0} {1} {2} ", RayEnd.X, RayEnd.Y, RayEnd.Z); - // if attachment we set it's asset id so object updates can reflect that - // if not, we set it's position in world. - if (!attachment) - { - float offsetHeight = 0; - pos = GetNewRezLocation( - RayStart, RayEnd, RayTargetID, Quaternion.Identity, - BypassRayCast, bRayEndIsIntersection, true, group.GetAxisAlignedBoundingBox(out offsetHeight), false); - pos.Z += offsetHeight; - group.AbsolutePosition = pos; - // m_log.InfoFormat("rezx point for inventory rezz is {0} {1} {2} and offsetheight was {3}", pos.X, pos.Y, pos.Z, offsetHeight); + AddNewSceneObject(group, true); - } - else - { - group.SetFromAssetID(itemID); - } + // m_log.InfoFormat("ray end point for inventory rezz is {0} {1} {2} ", RayEnd.X, RayEnd.Y, RayEnd.Z); + // if attachment we set it's asset id so object updates can reflect that + // if not, we set it's position in world. + if (!attachment) + { + float offsetHeight = 0; + pos = GetNewRezLocation( + RayStart, RayEnd, RayTargetID, Quaternion.Identity, + BypassRayCast, bRayEndIsIntersection, true, group.GetAxisAlignedBoundingBox(out offsetHeight), false); + pos.Z += offsetHeight; + group.AbsolutePosition = pos; + // m_log.InfoFormat("rezx point for inventory rezz is {0} {1} {2} and offsetheight was {3}", pos.X, pos.Y, pos.Z, offsetHeight); - SceneObjectPart rootPart = null; - try - { - rootPart = group.GetChildPart(group.UUID); - } - catch (NullReferenceException) - { - string isAttachment = ""; + } + else + { + group.SetFromAssetID(itemID); + } - if (attachment) - isAttachment = " Object was an attachment"; + SceneObjectPart rootPart = null; + try + { + rootPart = group.GetChildPart(group.UUID); + } + catch (NullReferenceException) + { + string isAttachment = ""; - m_log.Error("[AGENT INVENTORY]: Error rezzing ItemID: " + itemID + " object has no rootpart." + isAttachment); - } + if (attachment) + isAttachment = " Object was an attachment"; - // Since renaming the item in the inventory does not affect the name stored - // in the serialization, transfer the correct name from the inventory to the - // object itself before we rez. - rootPart.Name = item.Name; - rootPart.Description = item.Description; + m_log.Error("[AGENT INVENTORY]: Error rezzing ItemID: " + itemID + " object has no rootpart." + isAttachment); + } - List partList = new List(group.Children.Values); + // Since renaming the item in the inventory does not affect the name stored + // in the serialization, transfer the correct name from the inventory to the + // object itself before we rez. + rootPart.Name = item.Name; + rootPart.Description = item.Description; - group.SetGroup(remoteClient.ActiveGroupId, remoteClient); - if (rootPart.OwnerID != item.Owner) - { - //Need to kill the for sale here - rootPart.ObjectSaleType = 0; - rootPart.SalePrice = 10; + List partList = new List(group.Children.Values); - if (Permissions.PropagatePermissions()) - { - if ((item.CurrentPermissions & 8) != 0) - { - foreach (SceneObjectPart part in partList) - { - part.EveryoneMask = item.EveryOnePermissions; - part.NextOwnerMask = item.NextPermissions; - part.GroupMask = 0; // DO NOT propagate here - } - } - group.ApplyNextOwnerPermissions(); - } - } + group.SetGroup(remoteClient.ActiveGroupId, remoteClient); + if (rootPart.OwnerID != item.Owner) + { + //Need to kill the for sale here + rootPart.ObjectSaleType = 0; + rootPart.SalePrice = 10; - foreach (SceneObjectPart part in partList) + if (Permissions.PropagatePermissions()) + { + if ((item.CurrentPermissions & 8) != 0) { - if (part.OwnerID != item.Owner) - { - part.LastOwnerID = part.OwnerID; - part.OwnerID = item.Owner; - part.Inventory.ChangeInventoryOwner(item.Owner); - } - else if (((item.CurrentPermissions & 8) != 0) && (!attachment)) // Slam! + foreach (SceneObjectPart part in partList) { part.EveryoneMask = item.EveryOnePermissions; part.NextOwnerMask = item.NextPermissions; - part.GroupMask = 0; // DO NOT propagate here } } + group.ApplyNextOwnerPermissions(); + } + } - rootPart.TrimPermissions(); + foreach (SceneObjectPart part in partList) + { + if (part.OwnerID != item.Owner) + { + part.LastOwnerID = part.OwnerID; + part.OwnerID = item.Owner; + part.Inventory.ChangeInventoryOwner(item.Owner); + } + else if (((item.CurrentPermissions & 8) != 0) && (!attachment)) // Slam! + { + part.EveryoneMask = item.EveryOnePermissions; + part.NextOwnerMask = item.NextPermissions; - if (!attachment) - { - if (group.RootPart.Shape.PCode == (byte)PCode.Prim) - { - group.ClearPartAttachmentData(); - } - } + part.GroupMask = 0; // DO NOT propagate here + } + } - if (!attachment) - { - // Fire on_rez - group.CreateScriptInstances(0, true, DefaultScriptEngine, 0); + rootPart.TrimPermissions(); - rootPart.ScheduleFullUpdate(); - } + if (!attachment) + { + if (group.RootPart.Shape.PCode == (byte)PCode.Prim) + { + group.ClearPartAttachmentData(); + } + } - if (!Permissions.BypassPermissions()) - { - if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) - { - // If this is done on attachments, no - // copy ones will be lost, so avoid it - // - if (!attachment) - userInfo.DeleteItem(item.ID); - } - } + if (!attachment) + { + // Fire on_rez + group.CreateScriptInstances(0, true, DefaultScriptEngine, 0); + + rootPart.ScheduleFullUpdate(); + } - return rootPart.ParentGroup; + if (!Permissions.BypassPermissions()) + { + if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) + { + // If this is done on attachments, no + // copy ones will be lost, so avoid it + // + if (!attachment) + InventoryService.DeleteItem(item); } } + + return rootPart.ParentGroup; } - else - m_log.WarnFormat("[AGENT INVENTORY]: Root folder not found in {0}", RegionInfo.RegionName); } - else - m_log.WarnFormat("[AGENT INVENTORY]: User profile not found in {0}", RegionInfo.RegionName); return null; } @@ -2681,13 +2460,9 @@ namespace OpenSim.Region.Framework.Scenes ava.UpdateDatabase(remoteClient.AgentId, presence.Appearance); } part.ParentGroup.DetachToGround(); - CachedUserInfo userInfo = - CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); - if (userInfo != null) - { - userInfo.DeleteItem(inventoryID); - remoteClient.SendRemoveInventoryItem(inventoryID); - } + + InventoryService.DeleteItem(new InventoryItemBase(inventoryID)); + remoteClient.SendRemoveInventoryItem(inventoryID); } SendAttachEvent(part.ParentGroup.LocalId, itemID, UUID.Zero); } diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index 113918d..ba858ed 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs @@ -435,17 +435,7 @@ namespace OpenSim.Region.Framework.Scenes return; } - CachedUserInfo userProfile = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); - - if (null == userProfile) - { - m_log.ErrorFormat( - "[AGENT INVENTORY]: Could not find user profile for {0} {1}", - remoteClient.Name, remoteClient.AgentId); - return; - } - - userProfile.SendInventoryDecendents(remoteClient, folderID, fetchFolders, fetchItems); + SendInventoryUpdate(remoteClient, new InventoryFolderBase(folderID), fetchFolders, fetchItems); } /// @@ -543,19 +533,10 @@ namespace OpenSim.Region.Framework.Scenes public void HandleCreateInventoryFolder(IClientAPI remoteClient, UUID folderID, ushort folderType, string folderName, UUID parentID) { - CachedUserInfo userProfile = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); - - if (null == userProfile) - { - m_log.ErrorFormat( - "[AGENT INVENTORY]: Could not find user profile for {0} {1}", - remoteClient.Name, remoteClient.AgentId); - return; - } - - if (!userProfile.CreateFolder(folderName, folderID, folderType, parentID)) + InventoryFolderBase folder = new InventoryFolderBase(folderID, folderName, remoteClient.AgentId, (short)folderType, parentID, 1); + if (!InventoryService.AddFolder(folder)) { - m_log.ErrorFormat( + m_log.WarnFormat( "[AGENT INVENTORY]: Failed to move create folder for user {0} {1}", remoteClient.Name, remoteClient.AgentId); } diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 919075c..0c99166 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -3510,59 +3510,53 @@ namespace OpenSim.Region.Framework.Scenes case 2: // Sell a copy string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(group); - CachedUserInfo userInfo = - CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); + uint perms=group.GetEffectivePermissions(); - if (userInfo != null) + if ((perms & (uint)PermissionMask.Transfer) == 0) { - uint perms=group.GetEffectivePermissions(); - - if ((perms & (uint)PermissionMask.Transfer) == 0) - { - m_dialogModule.SendAlertToUser(remoteClient, "This item doesn't appear to be for sale"); - return false; - } + m_dialogModule.SendAlertToUser(remoteClient, "This item doesn't appear to be for sale"); + return false; + } - AssetBase asset = CreateAsset( - group.GetPartName(localID), - group.GetPartDescription(localID), - (sbyte)AssetType.Object, - Utils.StringToBytes(sceneObjectXml)); - AssetService.Store(asset); - - InventoryItemBase item = new InventoryItemBase(); - item.CreatorId = part.CreatorID.ToString(); - - item.ID = UUID.Random(); - item.Owner = remoteClient.AgentId; - item.AssetID = asset.FullID; - item.Description = asset.Description; - item.Name = asset.Name; - item.AssetType = asset.Type; - item.InvType = (int)InventoryType.Object; - item.Folder = categoryID; - - uint nextPerms=(perms & 7) << 13; - if ((nextPerms & (uint)PermissionMask.Copy) == 0) - perms &= ~(uint)PermissionMask.Copy; - if ((nextPerms & (uint)PermissionMask.Transfer) == 0) - perms &= ~(uint)PermissionMask.Transfer; - if ((nextPerms & (uint)PermissionMask.Modify) == 0) - perms &= ~(uint)PermissionMask.Modify; - - item.BasePermissions = perms & part.NextOwnerMask; - item.CurrentPermissions = perms & part.NextOwnerMask; - item.NextPermissions = part.NextOwnerMask; - item.EveryOnePermissions = part.EveryoneMask & - part.NextOwnerMask; - item.GroupPermissions = part.GroupMask & - part.NextOwnerMask; - item.CurrentPermissions |= 8; // Slam! - item.CreationDate = Util.UnixTimeSinceEpoch(); - - userInfo.AddItem(item); + AssetBase asset = CreateAsset( + group.GetPartName(localID), + group.GetPartDescription(localID), + (sbyte)AssetType.Object, + Utils.StringToBytes(sceneObjectXml)); + AssetService.Store(asset); + + InventoryItemBase item = new InventoryItemBase(); + item.CreatorId = part.CreatorID.ToString(); + + item.ID = UUID.Random(); + item.Owner = remoteClient.AgentId; + item.AssetID = asset.FullID; + item.Description = asset.Description; + item.Name = asset.Name; + item.AssetType = asset.Type; + item.InvType = (int)InventoryType.Object; + item.Folder = categoryID; + + uint nextPerms=(perms & 7) << 13; + if ((nextPerms & (uint)PermissionMask.Copy) == 0) + perms &= ~(uint)PermissionMask.Copy; + if ((nextPerms & (uint)PermissionMask.Transfer) == 0) + perms &= ~(uint)PermissionMask.Transfer; + if ((nextPerms & (uint)PermissionMask.Modify) == 0) + perms &= ~(uint)PermissionMask.Modify; + + item.BasePermissions = perms & part.NextOwnerMask; + item.CurrentPermissions = perms & part.NextOwnerMask; + item.NextPermissions = part.NextOwnerMask; + item.EveryOnePermissions = part.EveryoneMask & + part.NextOwnerMask; + item.GroupPermissions = part.GroupMask & + part.NextOwnerMask; + item.CurrentPermissions |= 8; // Slam! + item.CreationDate = Util.UnixTimeSinceEpoch(); + + if (InventoryService.AddItem(item)) remoteClient.SendInventoryItemCreateUpdate(item, 0); - } else { m_dialogModule.SendAlertToUser(remoteClient, "Cannot buy now. Your inventory is unavailable"); @@ -3577,8 +3571,8 @@ namespace OpenSim.Region.Framework.Scenes foreach (UUID invID in invList) { - TaskInventoryItem item = part.Inventory.GetInventoryItem(invID); - if ((item.CurrentPermissions & + TaskInventoryItem item1 = part.Inventory.GetInventoryItem(invID); + if ((item1.CurrentPermissions & (uint)PermissionMask.Transfer) == 0) { okToSell = false; diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 0e0999a..9599379 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs @@ -542,7 +542,7 @@ namespace OpenSim.Region.Framework.Scenes group.DetachToInventoryPrep(); m_log.Debug("[DETACH]: Saving attachpoint: " + ((uint)group.GetAttachmentPoint()).ToString()); - m_parentScene.updateKnownAsset(remoteClient, group, + m_parentScene.UpdateKnownItem(remoteClient, group, group.GetFromAssetID(), group.OwnerID); m_parentScene.DeleteSceneObject(group, false); return; @@ -1307,7 +1307,7 @@ namespace OpenSim.Region.Framework.Scenes group.UpdateGroupPosition(pos); group.RootPart.IsAttachment = false; group.AbsolutePosition = group.RootPart.AttachedPos; - m_parentScene.updateKnownAsset(remoteClient, group, group.GetFromAssetID(), group.OwnerID); + m_parentScene.UpdateKnownItem(remoteClient, group, group.GetFromAssetID(), group.OwnerID); group.SetAttachmentPoint(attachmentPoint); } -- cgit v1.1 From 6b9cc6c48d7b49cc4bce5dce4e66d7856a093b75 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 13 Aug 2009 11:30:29 -0700 Subject: Inventory redirects from CachedUserInfo to InventoryService COMPLETE! --- .../Framework/Scenes/Hypergrid/HGAssetMapper.cs | 50 +++--- .../Scenes/Hypergrid/HGScene.Inventory.cs | 31 ++-- OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 194 +++++++-------------- .../Framework/Scenes/Scene.PacketHandlers.cs | 129 +------------- .../Framework/Scenes/SceneCommunicationService.cs | 10 +- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 10 +- 6 files changed, 118 insertions(+), 306 deletions(-) (limited to 'OpenSim/Region/Framework') 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) { diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs index cb6794e..1b93f46 100644 --- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs @@ -117,25 +117,20 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid if (fromTaskID.Equals(UUID.Zero)) { - CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); - if (userInfo != null) + InventoryItemBase item = new InventoryItemBase(itemID); + item.Owner = remoteClient.AgentId; + item = InventoryService.QueryItem(item); + //if (item == null) + //{ // Fetch the item + // item = new InventoryItemBase(); + // item.Owner = remoteClient.AgentId; + // item.ID = itemID; + // item = m_assMapper.Get(item, userInfo.RootFolder.ID, userInfo); + //} + if (item != null) { - if (userInfo.RootFolder != null) - { - InventoryItemBase item = userInfo.RootFolder.FindItem(itemID); - if (item == null) - { // Fetch the item - item = new InventoryItemBase(); - item.Owner = remoteClient.AgentId; - item.ID = itemID; - item = m_assMapper.Get(item, userInfo.RootFolder.ID, userInfo); - } - if (item != null) - { - m_assMapper.Get(item.AssetID, remoteClient.AgentId); - - } - } + m_assMapper.Get(item.AssetID, remoteClient.AgentId); + } } diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 80f71b3..cd91e8c 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs @@ -558,24 +558,9 @@ namespace OpenSim.Region.Framework.Scenes if (item == null) { - CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(oldAgentID); - if (userInfo == null) - { - m_log.Error("[AGENT INVENTORY]: Failed to find user " + oldAgentID.ToString()); - return; - } - - if (userInfo.RootFolder != null) - { - item = userInfo.RootFolder.FindItem(oldItemID); + item = InventoryService.QueryItem(new InventoryItemBase(oldItemID)); - if (item == null) - { - m_log.Error("[AGENT INVENTORY]: Failed to find item " + oldItemID.ToString()); - return; - } - } - else + if (item == null) { m_log.Error("[AGENT INVENTORY]: Failed to find item " + oldItemID.ToString()); return; @@ -822,28 +807,15 @@ namespace OpenSim.Region.Framework.Scenes /// private void RemoveInventoryFolder(IClientAPI remoteClient, UUID folderID) { - CachedUserInfo userInfo - = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); - - if (userInfo == null) - { - m_log.Warn("[AGENT INVENTORY]: Failed to find user " + remoteClient.AgentId.ToString()); - return; - } + // Unclear is this handler is ever called by the Linden client, but it might - if (userInfo.RootFolder != null) + InventoryFolderBase folder = new InventoryFolderBase(folderID); + folder.Owner = remoteClient.AgentId; + InventoryFolderBase trash = InventoryService.GetFolderForType(remoteClient.AgentId, AssetType.TrashFolder); + if (trash != null) { - InventoryItemBase folder = userInfo.RootFolder.FindItem(folderID); - - if (folder != null) - { - m_log.WarnFormat( - "[AGENT INVENTORY]: Remove folder not implemented in request by {0} {1} for {2}", - remoteClient.Name, remoteClient.AgentId, folderID); - - // doesn't work just yet, commented out. will fix in next patch. - // userInfo.DeleteItem(folder); - } + folder.ParentID = trash.ID; + InventoryService.MoveFolder(folder); } } @@ -1060,20 +1032,7 @@ namespace OpenSim.Region.Framework.Scenes return MoveTaskInventoryItem(avatar.ControllingClient, folderId, part, itemId); } else - { - CachedUserInfo profile = CommsManager.UserProfileCacheService.GetUserDetails(avatarId); - if (profile == null || profile.RootFolder == null) - { - m_log.ErrorFormat( - "[PRIM INVENTORY]: " + - "Avatar {0} cannot be found to add item", - avatarId); - return null; - } - - if (!profile.HasReceivedInventory) - profile.FetchInventory(); - + { InventoryItemBase agentItem = CreateAgentInventoryItemFromTask(avatarId, part, itemId); if (agentItem == null) @@ -1265,39 +1224,33 @@ namespace OpenSim.Region.Framework.Scenes UUID copyID = UUID.Random(); if (itemID != UUID.Zero) { - CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); + InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); - if (userInfo != null && userInfo.RootFolder != null) + // Try library + if (null == item) { - InventoryItemBase item = userInfo.RootFolder.FindItem(itemID); - - // Try library - // XXX clumsy, possibly should be one call - if (null == item) - { - item = CommsManager.UserProfileCacheService.LibraryRoot.FindItem(itemID); - } + item = CommsManager.UserProfileCacheService.LibraryRoot.FindItem(itemID); + } - if (item != null) - { - part.ParentGroup.AddInventoryItem(remoteClient, primLocalID, item, copyID); - m_log.InfoFormat( - "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", - item.Name, primLocalID, remoteClient.Name); - part.GetProperties(remoteClient); - if (!Permissions.BypassPermissions()) - { - if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) - RemoveInventoryItem(remoteClient, itemID); - } - } - else + if (item != null) + { + part.ParentGroup.AddInventoryItem(remoteClient, primLocalID, item, copyID); + m_log.InfoFormat( + "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", + item.Name, primLocalID, remoteClient.Name); + part.GetProperties(remoteClient); + if (!Permissions.BypassPermissions()) { - m_log.ErrorFormat( - "[PRIM INVENTORY]: Could not find inventory item {0} to update for {1}!", - itemID, remoteClient.Name); + if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) + RemoveInventoryItem(remoteClient, itemID); } } + else + { + m_log.ErrorFormat( + "[PRIM INVENTORY]: Could not find inventory item {0} to update for {1}!", + itemID, remoteClient.Name); + } } } else // Updating existing item with new perms etc @@ -1334,53 +1287,48 @@ namespace OpenSim.Region.Framework.Scenes if (itemID != UUID.Zero) // transferred from an avatar inventory to the prim's inventory { - CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); + InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); - if (userInfo != null && userInfo.RootFolder != null) + // Try library + // XXX clumsy, possibly should be one call + if (null == item) { - InventoryItemBase item = userInfo.RootFolder.FindItem(itemID); - - // Try library - // XXX clumsy, possibly should be one call - if (null == item) - { - item = CommsManager.UserProfileCacheService.LibraryRoot.FindItem(itemID); - } + item = CommsManager.UserProfileCacheService.LibraryRoot.FindItem(itemID); + } - if (item != null) + if (item != null) + { + SceneObjectPart part = GetSceneObjectPart(localID); + if (part != null) { - SceneObjectPart part = GetSceneObjectPart(localID); - if (part != null) - { - if (!Permissions.CanEditObjectInventory(part.UUID, remoteClient.AgentId)) - return; + if (!Permissions.CanEditObjectInventory(part.UUID, remoteClient.AgentId)) + return; - part.ParentGroup.AddInventoryItem(remoteClient, localID, item, copyID); - // TODO: switch to posting on_rez here when scripts - // have state in inventory - part.Inventory.CreateScriptInstance(copyID, 0, false, DefaultScriptEngine, 0); + part.ParentGroup.AddInventoryItem(remoteClient, localID, item, copyID); + // TODO: switch to posting on_rez here when scripts + // have state in inventory + part.Inventory.CreateScriptInstance(copyID, 0, false, DefaultScriptEngine, 0); - // m_log.InfoFormat("[PRIMINVENTORY]: " + - // "Rezzed script {0} into prim local ID {1} for user {2}", - // item.inventoryName, localID, remoteClient.Name); - part.GetProperties(remoteClient); - } - else - { - m_log.ErrorFormat( - "[PRIM INVENTORY]: " + - "Could not rez script {0} into prim local ID {1} for user {2}" - + " because the prim could not be found in the region!", - item.Name, localID, remoteClient.Name); - } + // m_log.InfoFormat("[PRIMINVENTORY]: " + + // "Rezzed script {0} into prim local ID {1} for user {2}", + // item.inventoryName, localID, remoteClient.Name); + part.GetProperties(remoteClient); } else { m_log.ErrorFormat( - "[PRIM INVENTORY]: Could not find script inventory item {0} to rez for {1}!", - itemID, remoteClient.Name); + "[PRIM INVENTORY]: " + + "Could not rez script {0} into prim local ID {1} for user {2}" + + " because the prim could not be found in the region!", + item.Name, localID, remoteClient.Name); } } + else + { + m_log.ErrorFormat( + "[PRIM INVENTORY]: Could not find script inventory item {0} to rez for {1}!", + itemID, remoteClient.Name); + } } else // script has been rezzed directly into a prim's inventory { @@ -1670,26 +1618,6 @@ namespace OpenSim.Region.Framework.Scenes } } - private bool WaitForInventory(CachedUserInfo info) - { - // 200 Seconds wait. This is called in the context of the - // background delete thread, so we can afford to waste time - // here. - // - int count = 200; - - while (count > 0) - { - System.Threading.Thread.Sleep(100); - count--; - if (info.HasReceivedInventory) - return true; - } - m_log.DebugFormat("Timed out waiting for inventory of user {0}", - info.UserProfile.ID.ToString()); - return false; - } - /// /// Delete a scene object from a scene and place in the given avatar's inventory. /// Returns the UUID of the newly created asset. diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index ba858ed..e2debe5 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs @@ -382,31 +382,13 @@ namespace OpenSim.Region.Framework.Scenes return; } - CachedUserInfo userProfile = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); - - if (null == userProfile) + InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); + + if (item != null) { - m_log.ErrorFormat( - "[AGENT INVENTORY]: Could not find user profile for {0} {1}", - remoteClient.Name, remoteClient.AgentId); - return; - } - - if (userProfile.HasReceivedInventory) - { - InventoryItemBase item = null; - if (userProfile.RootFolder == null) - m_log.ErrorFormat( - "[AGENT INVENTORY]: User {0} {1} does not have a root folder.", - remoteClient.Name, remoteClient.AgentId); - else - item = userProfile.RootFolder.FindItem(itemID); - - if (item != null) - { - remoteClient.SendInventoryItemDetails(ownerID, item); - } + remoteClient.SendInventoryItemDetails(ownerID, item); } + // else shouldn't we send an alert message? } /// @@ -442,6 +424,7 @@ namespace OpenSim.Region.Framework.Scenes /// Handle the caps inventory descendents fetch. /// /// Since the folder structure is sent to the client on login, I believe we only need to handle items. + /// Diva comment 8/13/2009: what if someone gave us a folder in the meantime?? /// /// /// @@ -467,59 +450,10 @@ namespace OpenSim.Region.Framework.Scenes { return fold.RequestListOfItems(); } - - CachedUserInfo userProfile = CommsManager.UserProfileCacheService.GetUserDetails(agentID); - - if (null == userProfile) - { - m_log.ErrorFormat("[AGENT INVENTORY]: Could not find user profile for {0}", agentID); - return null; - } - - // XXX: When a client crosses into a scene, their entire inventory is fetched - // asynchronously. If the client makes a request before the inventory is received, we need - // to give the inventory a chance to come in. - // - // This is a crude way of dealing with that by retrying the lookup. It's not quite as bad - // in CAPS as doing this with the udp request, since here it won't hold up other packets. - // In fact, here we'll be generous and try for longer. - if (!userProfile.HasReceivedInventory) - { - int attempts = 0; - while (attempts++ < 30) - { - m_log.DebugFormat( - "[INVENTORY CACHE]: Poll number {0} for inventory items in folder {1} for user {2}", - attempts, folderID, agentID); - Thread.Sleep(2000); - - if (userProfile.HasReceivedInventory) - { - break; - } - } - } + InventoryCollection contents = InventoryService.GetFolderContent(agentID, folderID); + return contents.Items; - if (userProfile.HasReceivedInventory) - { - if ((fold = userProfile.RootFolder.FindFolder(folderID)) != null) - { - return fold.RequestListOfItems(); - } - else - { - m_log.WarnFormat( - "[AGENT INVENTORY]: Could not find folder {0} requested by user {1}", - folderID, agentID); - return null; - } - } - else - { - m_log.ErrorFormat("[INVENTORY CACHE]: Could not find root folder for user {0}", agentID); - return null; - } } /// @@ -579,34 +513,8 @@ namespace OpenSim.Region.Framework.Scenes } } - /// - /// Handle an inventory folder move request from the client. - /// - /// - /// - /// public void HandleMoveInventoryFolder(IClientAPI remoteClient, UUID folderID, UUID parentID) { - CachedUserInfo userProfile = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); - - if (null == userProfile) - { - m_log.ErrorFormat( - "[AGENT INVENTORY]: Could not find user profile for {0} {1}", - remoteClient.Name, remoteClient.AgentId); - return; - } - - if (!userProfile.MoveFolder(folderID, parentID)) - { - m_log.ErrorFormat( - "[AGENT INVENTORY]: Failed to move folder {0} to {1} for user {2}", - folderID, parentID, remoteClient.Name); - } - } - - public void HandleMoveInventoryFolder2(IClientAPI remoteClient, UUID folderID, UUID parentID) - { InventoryFolderBase folder = new InventoryFolderBase(folderID); folder = InventoryService.QueryFolder(folder); if (folder != null) @@ -628,27 +536,8 @@ namespace OpenSim.Region.Framework.Scenes /// /// /// - public void HandlePurgeInventoryDescendents(IClientAPI remoteClient, UUID folderID) - { - CachedUserInfo userProfile = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); - - if (null == userProfile) - { - m_log.ErrorFormat( - "[AGENT INVENTORY]: Could not find user profile for {0} {1}", - remoteClient.Name, remoteClient.AgentId); - return; - } - if (!userProfile.PurgeFolder(folderID)) - { - m_log.ErrorFormat( - "[AGENT INVENTORY]: Failed to purge folder for user {0} {1}", - remoteClient.Name, remoteClient.AgentId); - } - } - - public void HandlePurgeInventoryDescendents2(IClientAPI remoteClient, UUID folderID) + public void HandlePurgeInventoryDescendents(IClientAPI remoteClient, UUID folderID) { InventoryFolderBase folder = new InventoryFolderBase(folderID); diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 0140faa..af2753c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs @@ -1249,11 +1249,11 @@ namespace OpenSim.Region.Framework.Scenes } else // Not successful { - CachedUserInfo userInfo = m_commsProvider.UserProfileCacheService.GetUserDetails(agent.UUID); - if (userInfo != null) - { - userInfo.FetchInventory(); - } + //CachedUserInfo userInfo = m_commsProvider.UserProfileCacheService.GetUserDetails(agent.UUID); + //if (userInfo != null) + //{ + // userInfo.FetchInventory(); + //} agent.RestoreInCurrentScene(); } // In any case diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 4695df7..fc8b62e 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -833,11 +833,11 @@ namespace OpenSim.Region.Framework.Scenes m_scene.SwapRootAgentCount(false); - CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(m_uuid); - if (userInfo != null) - userInfo.FetchInventory(); - else - m_log.ErrorFormat("[SCENE]: Could not find user info for {0} when making it a root agent", m_uuid); + //CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(m_uuid); + //if (userInfo != null) + // userInfo.FetchInventory(); + //else + // m_log.ErrorFormat("[SCENE]: Could not find user info for {0} when making it a root agent", m_uuid); // On the next prim update, all objects will be sent // -- cgit v1.1 From 5246dc33dcfc51b7ebb19b269159df3991029350 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 13 Aug 2009 14:10:12 -0700 Subject: Renamed QueryItem/QueryFolder to GetItem/GetFolder. The word 'query' starting to get on my nerves. --- .../Scenes/Hypergrid/HGScene.Inventory.cs | 2 +- OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 22 ++++++++++---------- .../Framework/Scenes/Scene.PacketHandlers.cs | 4 ++-- .../Framework/Scenes/SceneCommunicationService.cs | 24 +++++++++++----------- 4 files changed, 26 insertions(+), 26 deletions(-) (limited to 'OpenSim/Region/Framework') diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs index 1b93f46..dd6928f 100644 --- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs @@ -119,7 +119,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid { InventoryItemBase item = new InventoryItemBase(itemID); item.Owner = remoteClient.AgentId; - item = InventoryService.QueryItem(item); + item = InventoryService.GetItem(item); //if (item == null) //{ // Fetch the item // item = new InventoryItemBase(); diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index cd91e8c..a941a74 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs @@ -140,7 +140,7 @@ namespace OpenSim.Region.Framework.Scenes /// public virtual UUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, UUID itemID, byte[] data) { - InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); + InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); if (item != null) { @@ -315,7 +315,7 @@ namespace OpenSim.Region.Framework.Scenes public void UpdateInventoryItemAsset(IClientAPI remoteClient, UUID transactionID, UUID itemID, InventoryItemBase itemUpd) { - InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); + InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); if (item != null) { @@ -408,7 +408,7 @@ namespace OpenSim.Region.Framework.Scenes { Console.WriteLine("Scene.Inventory.cs: GiveInventoryItem"); - InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemId)); + InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemId)); if ((item != null) && (item.Owner == senderId)) { @@ -505,7 +505,7 @@ namespace OpenSim.Region.Framework.Scenes UUID recipientId, UUID senderId, UUID folderId, UUID recipientParentFolderId) { //// Retrieve the folder from the sender - InventoryFolderBase folder = InventoryService.QueryFolder(new InventoryFolderBase(folderId)); + InventoryFolderBase folder = InventoryService.GetFolder(new InventoryFolderBase(folderId)); if (null == folder) { m_log.ErrorFormat( @@ -558,7 +558,7 @@ namespace OpenSim.Region.Framework.Scenes if (item == null) { - item = InventoryService.QueryItem(new InventoryItemBase(oldItemID)); + item = InventoryService.GetItem(new InventoryItemBase(oldItemID)); if (item == null) { @@ -636,7 +636,7 @@ namespace OpenSim.Region.Framework.Scenes m_log.DebugFormat( "[AGENT INVENTORY]: Moving item {0} to {1} for {2}", itemID, folderID, remoteClient.AgentId); - InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); + InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); if (item != null) { @@ -1224,7 +1224,7 @@ namespace OpenSim.Region.Framework.Scenes UUID copyID = UUID.Random(); if (itemID != UUID.Zero) { - InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); + InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); // Try library if (null == item) @@ -1287,7 +1287,7 @@ namespace OpenSim.Region.Framework.Scenes if (itemID != UUID.Zero) // transferred from an avatar inventory to the prim's inventory { - InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); + InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); // Try library // XXX clumsy, possibly should be one call @@ -1673,7 +1673,7 @@ namespace OpenSim.Region.Framework.Scenes if (DeRezAction.SaveToExistingUserInventoryItem == action) { item = new InventoryItemBase(objectGroup.RootPart.FromUserInventoryItemID); - item = InventoryService.QueryItem(item); + item = InventoryService.GetItem(item); //item = userInfo.RootFolder.FindItem( // objectGroup.RootPart.FromUserInventoryItemID); @@ -1834,7 +1834,7 @@ namespace OpenSim.Region.Framework.Scenes string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(objectGroup); - InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); + InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); if (item != null) { @@ -1984,7 +1984,7 @@ namespace OpenSim.Region.Framework.Scenes BypassRayCast, bRayEndIsIntersection,true,scale, false); // Rez object - InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); + InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); if (item != null) { diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index e2debe5..bcc9bcb 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs @@ -382,7 +382,7 @@ namespace OpenSim.Region.Framework.Scenes return; } - InventoryItemBase item = InventoryService.QueryItem(new InventoryItemBase(itemID)); + InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); if (item != null) { @@ -516,7 +516,7 @@ namespace OpenSim.Region.Framework.Scenes public void HandleMoveInventoryFolder(IClientAPI remoteClient, UUID folderID, UUID parentID) { InventoryFolderBase folder = new InventoryFolderBase(folderID); - folder = InventoryService.QueryFolder(folder); + folder = InventoryService.GetFolder(folder); if (folder != null) { folder.ParentID = parentID; diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index af2753c..f28352c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs @@ -1020,11 +1020,11 @@ namespace OpenSim.Region.Framework.Scenes public bool WaitForCallback(UUID id) { - int count = 20; + int count = 200; while (m_agentsInTransit.Contains(id) && count-- > 0) { //m_log.Debug(" >>> Waiting... " + count); - Thread.Sleep(1000); + Thread.Sleep(100); } if (count > 0) @@ -1141,16 +1141,16 @@ namespace OpenSim.Region.Framework.Scenes { pos = pos + (agent.Velocity); - CachedUserInfo userInfo = m_commsProvider.UserProfileCacheService.GetUserDetails(agent.UUID); - if (userInfo != null) - { - userInfo.DropInventory(); - } - else - { - m_log.WarnFormat("[SCENE COMM]: No cached user info found for {0} {1} on leaving region {2}", - agent.Name, agent.UUID, agent.Scene.RegionInfo.RegionName); - } + //CachedUserInfo userInfo = m_commsProvider.UserProfileCacheService.GetUserDetails(agent.UUID); + //if (userInfo != null) + //{ + // userInfo.DropInventory(); + //} + //else + //{ + // m_log.WarnFormat("[SCENE COMM]: No cached user info found for {0} {1} on leaving region {2}", + // agent.Name, agent.UUID, agent.Scene.RegionInfo.RegionName); + //} //bool crossingSuccessful = // CrossToNeighbouringRegion(neighbourHandle, agent.ControllingClient.AgentId, pos, -- cgit v1.1 From 1bbf06405c109a4299a9494555f8223dd954610b Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 15 Aug 2009 09:36:45 -0700 Subject: Changed FromAssetID to FromItemID --- OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 8 ++++---- OpenSim/Region/Framework/Scenes/Scene.cs | 2 +- OpenSim/Region/Framework/Scenes/SceneGraph.cs | 14 +++++++------- OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 18 +++++++++--------- OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 6 +++--- 5 files changed, 24 insertions(+), 24 deletions(-) (limited to 'OpenSim/Region/Framework') diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index a941a74..cea9044 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs @@ -1906,8 +1906,8 @@ namespace OpenSim.Region.Framework.Scenes } item.CreationDate = Util.UnixTimeSinceEpoch(); - // sets assetID so client can show asset as 'attached' in inventory - grp.SetFromAssetID(item.ID); + // sets itemID so client can show item as 'attached' in inventory + grp.SetFromItemID(item.ID); if (InventoryService.AddItem(item)) remoteClient.SendInventoryItemCreateUpdate(item, 0); @@ -2044,7 +2044,7 @@ namespace OpenSim.Region.Framework.Scenes } else { - group.SetFromAssetID(itemID); + group.SetFromItemID(itemID); } SceneObjectPart rootPart = null; @@ -2373,7 +2373,7 @@ namespace OpenSim.Region.Framework.Scenes if (part == null || part.ParentGroup == null) return; - UUID inventoryID = part.ParentGroup.GetFromAssetID(); + UUID inventoryID = part.ParentGroup.GetFromItemID(); ScenePresence presence; if (TryGetAvatar(remoteClient.AgentId, out presence)) diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 107a4a4..b9edd6e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -1962,7 +1962,7 @@ namespace OpenSim.Region.Framework.Scenes m_log.DebugFormat("[ATTACHMENT]: Received " + "attachment {0}, inworld asset id {1}", //grp.RootPart.LastOwnerID.ToString(), - grp.GetFromAssetID(), + grp.GetFromItemID(), grp.UUID.ToString()); //grp.SetFromAssetID(grp.RootPart.LastOwnerID); diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 9599379..7b6b666 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs @@ -442,7 +442,7 @@ namespace OpenSim.Region.Framework.Scenes if (group != null) { //group.DetachToGround(); - m_parentScene.DetachSingleAttachmentToInv(group.GetFromAssetID(), remoteClient); + m_parentScene.DetachSingleAttachmentToInv(group.GetFromItemID(), remoteClient); } } @@ -489,7 +489,7 @@ namespace OpenSim.Region.Framework.Scenes // Calls attach with a Zero position // AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, Vector3.Zero, false); - m_parentScene.SendAttachEvent(objectLocalID, part.ParentGroup.GetFromAssetID(), remoteClient.AgentId); + m_parentScene.SendAttachEvent(objectLocalID, part.ParentGroup.GetFromItemID(), remoteClient.AgentId); } public SceneObjectGroup RezSingleAttachment( @@ -536,14 +536,14 @@ namespace OpenSim.Region.Framework.Scenes if (entity is SceneObjectGroup) { group = (SceneObjectGroup)entity; - if (group.GetFromAssetID() == itemID) + if (group.GetFromItemID() == itemID) { m_parentScene.SendAttachEvent(group.LocalId, itemID, UUID.Zero); group.DetachToInventoryPrep(); m_log.Debug("[DETACH]: Saving attachpoint: " + ((uint)group.GetAttachmentPoint()).ToString()); m_parentScene.UpdateKnownItem(remoteClient, group, - group.GetFromAssetID(), group.OwnerID); + group.GetFromItemID(), group.OwnerID); m_parentScene.DeleteSceneObject(group, false); return; } @@ -588,13 +588,13 @@ namespace OpenSim.Region.Framework.Scenes // Saves and gets assetID UUID itemId; - if (group.GetFromAssetID() == UUID.Zero) + if (group.GetFromItemID() == UUID.Zero) { m_parentScene.attachObjectAssetStore(remoteClient, group, remoteClient.AgentId, out itemId); } else { - itemId = group.GetFromAssetID(); + itemId = group.GetFromItemID(); } m_parentScene.AttachObject(remoteClient, AttachmentPt, itemId, group); @@ -1307,7 +1307,7 @@ namespace OpenSim.Region.Framework.Scenes group.UpdateGroupPosition(pos); group.RootPart.IsAttachment = false; group.AbsolutePosition = group.RootPart.AttachedPos; - m_parentScene.UpdateKnownItem(remoteClient, group, group.GetFromAssetID(), group.OwnerID); + m_parentScene.UpdateKnownItem(remoteClient, group, group.GetFromItemID(), group.OwnerID); group.SetAttachmentPoint(attachmentPoint); } diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index c86e4a1..00c59ca 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -447,22 +447,22 @@ namespace OpenSim.Region.Framework.Scenes } } - public void SetFromAssetID(UUID AssetId) + public void SetFromItemID(UUID AssetId) { lock (m_parts) { foreach (SceneObjectPart part in m_parts.Values) { - part.FromAssetID = AssetId; + part.FromItemID = AssetId; } } } - public UUID GetFromAssetID() + public UUID GetFromItemID() { if (m_rootPart != null) { - return m_rootPart.FromAssetID; + return m_rootPart.FromItemID; } return UUID.Zero; } @@ -3374,19 +3374,19 @@ namespace OpenSim.Region.Framework.Scenes public virtual string ExtraToXmlString() { - return "" + GetFromAssetID().ToString() + ""; + return "" + GetFromItemID().ToString() + ""; } public virtual void ExtraFromXmlString(string xmlstr) { - string id = xmlstr.Substring(xmlstr.IndexOf("")); - id = xmlstr.Replace("", ""); - id = id.Replace("", ""); + string id = xmlstr.Substring(xmlstr.IndexOf("")); + id = xmlstr.Replace("", ""); + id = id.Replace("", ""); UUID uuid = UUID.Zero; UUID.TryParse(id, out uuid); - SetFromAssetID(uuid); + SetFromItemID(uuid); } #endregion diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 3646811..c95667a 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -139,7 +139,7 @@ namespace OpenSim.Region.Framework.Scenes public uint TimeStampTerse = 0; [XmlIgnore] - public UUID FromAssetID = UUID.Zero; + public UUID FromItemID = UUID.Zero; /// /// The UUID of the user inventory item from which this object was rezzed if this is a root part. @@ -2389,7 +2389,7 @@ if (m_shape != null) { remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, _ownerID, m_text, color, _parentID, m_particleSystem, m_clickAction, (byte)m_material, m_TextureAnimation, IsAttachment, - AttachmentPoint,FromAssetID, Sound, SoundGain, SoundFlags, SoundRadius); + AttachmentPoint,FromItemID, Sound, SoundGain, SoundFlags, SoundRadius); } /// @@ -3767,7 +3767,7 @@ if (m_shape != null) { (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, lPos, RotationOffset, Velocity, - RotationalVelocity, state, FromAssetID, + RotationalVelocity, state, FromItemID, OwnerID, (int)AttachmentPoint); } -- cgit v1.1