aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-21 21:16:42 +0000
committerJustin Clarke Casey2008-11-21 21:16:42 +0000
commit915593bfbc2f0d6729efe4dfe8d4c8a3f0fc9fbe (patch)
tree1f62bf777f73c4f3fffb2f5237cd7e5eaeddcb6f /OpenSim/Region/Environment/Scenes/Scene.cs
parent* Extend sog delete to inventory test to crank the normally async sog deleter... (diff)
downloadopensim-SC-915593bfbc2f0d6729efe4dfe8d4c8a3f0fc9fbe.zip
opensim-SC-915593bfbc2f0d6729efe4dfe8d4c8a3f0fc9fbe.tar.gz
opensim-SC-915593bfbc2f0d6729efe4dfe8d4c8a3f0fc9fbe.tar.bz2
opensim-SC-915593bfbc2f0d6729efe4dfe8d4c8a3f0fc9fbe.tar.xz
* refactor: Rip out SOP inventory from the partial into a separate class
* SceneObjectPartInventory.cs isn't a particularly good name but it's probably not got a long life * A proper inventory interface to follow * Parallel changes for other inventory partial classes to follow at a later date
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 221af44..9c29c44 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -4277,8 +4277,8 @@ namespace OpenSim.Region.Environment.Scenes
4277 { 4277 {
4278 foreach (SceneObjectPart child in partList) 4278 foreach (SceneObjectPart child in partList)
4279 { 4279 {
4280 child.ChangeInventoryOwner(remoteClient.AgentId); 4280 child.Inventory.ChangeInventoryOwner(remoteClient.AgentId);
4281 child.ApplyNextOwnerPermissions(); 4281 child.Inventory.ApplyNextOwnerPermissions();
4282 } 4282 }
4283 } 4283 }
4284 4284
@@ -4355,13 +4355,13 @@ namespace OpenSim.Region.Environment.Scenes
4355 break; 4355 break;
4356 4356
4357 case 3: // Sell contents 4357 case 3: // Sell contents
4358 List<UUID> invList = part.GetInventoryList(); 4358 List<UUID> invList = part.Inventory.GetInventoryList();
4359 4359
4360 bool okToSell = true; 4360 bool okToSell = true;
4361 4361
4362 foreach (UUID invID in invList) 4362 foreach (UUID invID in invList)
4363 { 4363 {
4364 TaskInventoryItem item = part.GetInventoryItem(invID); 4364 TaskInventoryItem item = part.Inventory.GetInventoryItem(invID);
4365 if ((item.CurrentPermissions & 4365 if ((item.CurrentPermissions &
4366 (uint)PermissionMask.Transfer) == 0) 4366 (uint)PermissionMask.Transfer) == 0)
4367 { 4367 {