diff options
author | Justin Clarke Casey | 2008-05-03 18:01:38 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-05-03 18:01:38 +0000 |
commit | f5609ba452ba019d2e84643a69c4776c9ec8af66 (patch) | |
tree | 435b444fb1126e5e54ad524e4b02503e592f9c23 /OpenSim/Region/Environment/Scenes | |
parent | *Moved EstateManager into a region module (diff) | |
download | opensim-SC_OLD-f5609ba452ba019d2e84643a69c4776c9ec8af66.zip opensim-SC_OLD-f5609ba452ba019d2e84643a69c4776c9ec8af66.tar.gz opensim-SC_OLD-f5609ba452ba019d2e84643a69c4776c9ec8af66.tar.bz2 opensim-SC_OLD-f5609ba452ba019d2e84643a69c4776c9ec8af66.tar.xz |
* Refactor: remove pointless agentId parameter from CachedUserInfo.AddItem()
* Remove old framework asset transactions files which were region modularized
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 12 |
1 files changed, 6 insertions, 6 deletions
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 | |||
69 | 69 | ||
70 | if (userInfo != null) | 70 | if (userInfo != null) |
71 | { | 71 | { |
72 | userInfo.AddItem(remoteClient.AgentId, item); | 72 | userInfo.AddItem(item); |
73 | remoteClient.SendInventoryItemCreateUpdate(item); | 73 | remoteClient.SendInventoryItemCreateUpdate(item); |
74 | 74 | ||
75 | int userlevel = 0; | 75 | int userlevel = 0; |
@@ -372,7 +372,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
372 | itemCopy.SalePrice = item.SalePrice; | 372 | itemCopy.SalePrice = item.SalePrice; |
373 | itemCopy.SaleType = item.SaleType; | 373 | itemCopy.SaleType = item.SaleType; |
374 | 374 | ||
375 | recipientUserInfo.AddItem(recipientClient.AgentId, itemCopy); | 375 | recipientUserInfo.AddItem(itemCopy); |
376 | 376 | ||
377 | // Let the recipient client know about this new item | 377 | // Let the recipient client know about this new item |
378 | recipientClient.SendBulkUpdateInventory(itemCopy); | 378 | recipientClient.SendBulkUpdateInventory(itemCopy); |
@@ -533,7 +533,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
533 | item.CurrentPermissions = 2147483647; | 533 | item.CurrentPermissions = 2147483647; |
534 | item.NextPermissions = nextOwnerMask; | 534 | item.NextPermissions = nextOwnerMask; |
535 | 535 | ||
536 | userInfo.AddItem(remoteClient.AgentId, item); | 536 | userInfo.AddItem(item); |
537 | remoteClient.SendInventoryItemCreateUpdate(item); | 537 | remoteClient.SendInventoryItemCreateUpdate(item); |
538 | } | 538 | } |
539 | else | 539 | else |
@@ -1011,7 +1011,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1011 | 1011 | ||
1012 | // TODO: add the new fields (Flags, Sale info, etc) | 1012 | // TODO: add the new fields (Flags, Sale info, etc) |
1013 | 1013 | ||
1014 | userInfo.AddItem(remoteClient.AgentId, item); | 1014 | userInfo.AddItem(item); |
1015 | remoteClient.SendInventoryItemCreateUpdate(item); | 1015 | remoteClient.SendInventoryItemCreateUpdate(item); |
1016 | } | 1016 | } |
1017 | 1017 | ||
@@ -1101,7 +1101,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1101 | item.NextPermissions = objectGroup.RootPart.NextOwnerMask; | 1101 | item.NextPermissions = objectGroup.RootPart.NextOwnerMask; |
1102 | } | 1102 | } |
1103 | 1103 | ||
1104 | userInfo.AddItem(agentID, item); | 1104 | userInfo.AddItem(item); |
1105 | 1105 | ||
1106 | // this gets called when the agent loggs off! | 1106 | // this gets called when the agent loggs off! |
1107 | if (remoteClient != null) | 1107 | if (remoteClient != null) |
@@ -1158,7 +1158,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1158 | item.NextPermissions = objectGroup.RootPart.NextOwnerMask; | 1158 | item.NextPermissions = objectGroup.RootPart.NextOwnerMask; |
1159 | } | 1159 | } |
1160 | 1160 | ||
1161 | userInfo.AddItem(remoteClient.AgentId, item); | 1161 | userInfo.AddItem(item); |
1162 | remoteClient.SendInventoryItemCreateUpdate(item); | 1162 | remoteClient.SendInventoryItemCreateUpdate(item); |
1163 | return item.AssetID; | 1163 | return item.AssetID; |
1164 | } | 1164 | } |