* Refactor: remove pointless agentId parameter from CachedUserInfo.AddItem()

* Remove old framework asset transactions files which were region modularized

2 files changed, 7 insertions, 7 deletions

diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index 555d5f4..19d2913 100644
--- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -392,7 +392,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
                     item.NextPermissions = nextPerm;
                     item.Flags = (uint) wearableType;
 
-                    userInfo.AddItem(ourClient.AgentId, item);
+                    userInfo.AddItem(item);
                     ourClient.SendInventoryItemCreateUpdate(item);
                 }
             }
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;
                 }