From f5609ba452ba019d2e84643a69c4776c9ec8af66 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Sat, 3 May 2008 18:01:38 +0000 Subject: * Refactor: remove pointless agentId parameter from CachedUserInfo.AddItem() * Remove old framework asset transactions files which were region modularized --- OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes') diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 6bd5d1a..baca696 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs @@ -69,7 +69,7 @@ namespace OpenSim.Region.Environment.Scenes if (userInfo != null) { - userInfo.AddItem(remoteClient.AgentId, item); + userInfo.AddItem(item); remoteClient.SendInventoryItemCreateUpdate(item); int userlevel = 0; @@ -372,7 +372,7 @@ namespace OpenSim.Region.Environment.Scenes itemCopy.SalePrice = item.SalePrice; itemCopy.SaleType = item.SaleType; - recipientUserInfo.AddItem(recipientClient.AgentId, itemCopy); + recipientUserInfo.AddItem(itemCopy); // Let the recipient client know about this new item recipientClient.SendBulkUpdateInventory(itemCopy); @@ -533,7 +533,7 @@ namespace OpenSim.Region.Environment.Scenes item.CurrentPermissions = 2147483647; item.NextPermissions = nextOwnerMask; - userInfo.AddItem(remoteClient.AgentId, item); + userInfo.AddItem(item); remoteClient.SendInventoryItemCreateUpdate(item); } else @@ -1011,7 +1011,7 @@ namespace OpenSim.Region.Environment.Scenes // TODO: add the new fields (Flags, Sale info, etc) - userInfo.AddItem(remoteClient.AgentId, item); + userInfo.AddItem(item); remoteClient.SendInventoryItemCreateUpdate(item); } @@ -1101,7 +1101,7 @@ namespace OpenSim.Region.Environment.Scenes item.NextPermissions = objectGroup.RootPart.NextOwnerMask; } - userInfo.AddItem(agentID, item); + userInfo.AddItem(item); // this gets called when the agent loggs off! if (remoteClient != null) @@ -1158,7 +1158,7 @@ namespace OpenSim.Region.Environment.Scenes item.NextPermissions = objectGroup.RootPart.NextOwnerMask; } - userInfo.AddItem(remoteClient.AgentId, item); + userInfo.AddItem(item); remoteClient.SendInventoryItemCreateUpdate(item); return item.AssetID; } -- cgit v1.1