aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
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/Modules
parent* Extend sog delete to inventory test to crank the normally async sog deleter... (diff)
downloadopensim-SC_OLD-915593bfbc2f0d6729efe4dfe8d4c8a3f0fc9fbe.zip
opensim-SC_OLD-915593bfbc2f0d6729efe4dfe8d4c8a3f0fc9fbe.tar.gz
opensim-SC_OLD-915593bfbc2f0d6729efe4dfe8d4c8a3f0fc9fbe.tar.bz2
opensim-SC_OLD-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/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs6
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs
index 05b7fa3..3ef2e1f 100644
--- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -267,7 +267,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
267 267
268 m_userTransactions.Manager.MyScene.CommsManager.AssetCache.AddAsset(m_asset); 268 m_userTransactions.Manager.MyScene.CommsManager.AssetCache.AddAsset(m_asset);
269 269
270 if (part.UpdateInventoryItem(item)) 270 if (part.Inventory.UpdateInventoryItem(item))
271 part.GetProperties(remoteClient); 271 part.GetProperties(remoteClient);
272 } 272 }
273 273
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index e41f975..d7865b2 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -796,7 +796,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
796 if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0) 796 if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
797 return false; 797 return false;
798 798
799 TaskInventoryItem ti = part.GetInventoryItem(notecard); 799 TaskInventoryItem ti = part.Inventory.GetInventoryItem(notecard);
800 800
801 if (ti == null) 801 if (ti == null)
802 return false; 802 return false;
@@ -1188,7 +1188,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
1188 if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0) 1188 if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
1189 return false; 1189 return false;
1190 1190
1191 TaskInventoryItem ti = part.GetInventoryItem(script); 1191 TaskInventoryItem ti = part.Inventory.GetInventoryItem(script);
1192 1192
1193 if (ti == null) 1193 if (ti == null)
1194 return false; 1194 return false;
@@ -1266,7 +1266,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
1266 if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0) 1266 if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
1267 return false; 1267 return false;
1268 1268
1269 TaskInventoryItem ti = part.GetInventoryItem(notecard); 1269 TaskInventoryItem ti = part.Inventory.GetInventoryItem(notecard);
1270 1270
1271 if (ti == null) 1271 if (ti == null)
1272 return false; 1272 return false;