aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.Inventory.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.Inventory.cs
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/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs40
1 files changed, 20 insertions, 20 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 19b8e16..686f4ba 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -280,7 +280,7 @@ namespace OpenSim.Region.Environment.Scenes
280 280
281 if (isScriptRunning) 281 if (isScriptRunning)
282 { 282 {
283 part.RemoveScriptInstance(item.ItemID); 283 part.Inventory.RemoveScriptInstance(item.ItemID);
284 } 284 }
285 // Update item with new asset 285 // Update item with new asset
286 item.AssetID = asset.FullID; 286 item.AssetID = asset.FullID;
@@ -292,7 +292,7 @@ namespace OpenSim.Region.Environment.Scenes
292 { 292 {
293 // Needs to determine which engine was running it and use that 293 // Needs to determine which engine was running it and use that
294 // 294 //
295 part.CreateScriptInstance(item.ItemID, 0, false, DefaultScriptEngine, 0); 295 part.Inventory.CreateScriptInstance(item.ItemID, 0, false, DefaultScriptEngine, 0);
296 } 296 }
297 else 297 else
298 { 298 {
@@ -945,7 +945,7 @@ namespace OpenSim.Region.Environment.Scenes
945 945
946 private InventoryItemBase CreateAgentInventoryItemFromTask(UUID destAgent, SceneObjectPart part, UUID itemId) 946 private InventoryItemBase CreateAgentInventoryItemFromTask(UUID destAgent, SceneObjectPart part, UUID itemId)
947 { 947 {
948 TaskInventoryItem taskItem = part.GetInventoryItem(itemId); 948 TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(itemId);
949 949
950 if (null == taskItem) 950 if (null == taskItem)
951 { 951 {
@@ -995,7 +995,7 @@ namespace OpenSim.Region.Environment.Scenes
995 if (!ExternalChecks.ExternalChecksBypassPermissions()) 995 if (!ExternalChecks.ExternalChecksBypassPermissions())
996 { 996 {
997 if ((taskItem.CurrentPermissions & (uint)PermissionMask.Copy) == 0) 997 if ((taskItem.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
998 part.RemoveInventoryItem(itemId); 998 part.Inventory.RemoveInventoryItem(itemId);
999 } 999 }
1000 1000
1001 return agentItem; 1001 return agentItem;
@@ -1040,7 +1040,7 @@ namespace OpenSim.Region.Environment.Scenes
1040 return; 1040 return;
1041 } 1041 }
1042 1042
1043 TaskInventoryItem taskItem = part.GetInventoryItem(itemId); 1043 TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(itemId);
1044 1044
1045 if (null == taskItem) 1045 if (null == taskItem)
1046 { 1046 {
@@ -1104,7 +1104,7 @@ namespace OpenSim.Region.Environment.Scenes
1104 /// <param name="itemId"></param> 1104 /// <param name="itemId"></param>
1105 public void MoveTaskInventoryItem(UUID destId, SceneObjectPart part, UUID itemId) 1105 public void MoveTaskInventoryItem(UUID destId, SceneObjectPart part, UUID itemId)
1106 { 1106 {
1107 TaskInventoryItem srcTaskItem = part.GetInventoryItem(itemId); 1107 TaskInventoryItem srcTaskItem = part.Inventory.GetInventoryItem(itemId);
1108 1108
1109 if (srcTaskItem == null) 1109 if (srcTaskItem == null)
1110 { 1110 {
@@ -1184,10 +1184,10 @@ namespace OpenSim.Region.Environment.Scenes
1184 destTaskItem.InvType = srcTaskItem.InvType; 1184 destTaskItem.InvType = srcTaskItem.InvType;
1185 destTaskItem.Type = srcTaskItem.Type; 1185 destTaskItem.Type = srcTaskItem.Type;
1186 1186
1187 destPart.AddInventoryItem(destTaskItem, part.OwnerID != destPart.OwnerID); 1187 destPart.Inventory.AddInventoryItem(destTaskItem, part.OwnerID != destPart.OwnerID);
1188 1188
1189 if ((srcTaskItem.CurrentPermissions & (uint)PermissionMask.Copy) == 0) 1189 if ((srcTaskItem.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
1190 part.RemoveInventoryItem(itemId); 1190 part.Inventory.RemoveInventoryItem(itemId);
1191 1191
1192 ScenePresence avatar; 1192 ScenePresence avatar;
1193 1193
@@ -1254,7 +1254,7 @@ namespace OpenSim.Region.Environment.Scenes
1254 1254
1255 if (part != null) 1255 if (part != null)
1256 { 1256 {
1257 TaskInventoryItem currentItem = part.GetInventoryItem(itemID); 1257 TaskInventoryItem currentItem = part.Inventory.GetInventoryItem(itemID);
1258 bool allowInventoryDrop = (part.GetEffectiveObjectFlags() 1258 bool allowInventoryDrop = (part.GetEffectiveObjectFlags()
1259 & (uint)PrimFlags.AllowInventoryDrop) != 0; 1259 & (uint)PrimFlags.AllowInventoryDrop) != 0;
1260 1260
@@ -1314,7 +1314,7 @@ namespace OpenSim.Region.Environment.Scenes
1314 agentTransactions.HandleTaskItemUpdateFromTransaction( 1314 agentTransactions.HandleTaskItemUpdateFromTransaction(
1315 remoteClient, part, transactionID, currentItem); 1315 remoteClient, part, transactionID, currentItem);
1316 } 1316 }
1317 if (part.UpdateInventoryItem(itemInfo)) 1317 if (part.Inventory.UpdateInventoryItem(itemInfo))
1318 part.GetProperties(remoteClient); 1318 part.GetProperties(remoteClient);
1319 } 1319 }
1320 } 1320 }
@@ -1364,7 +1364,7 @@ namespace OpenSim.Region.Environment.Scenes
1364 part.ParentGroup.AddInventoryItem(remoteClient, localID, item, copyID); 1364 part.ParentGroup.AddInventoryItem(remoteClient, localID, item, copyID);
1365 // TODO: switch to posting on_rez here when scripts 1365 // TODO: switch to posting on_rez here when scripts
1366 // have state in inventory 1366 // have state in inventory
1367 part.CreateScriptInstance(copyID, 0, false, DefaultScriptEngine, 0); 1367 part.Inventory.CreateScriptInstance(copyID, 0, false, DefaultScriptEngine, 0);
1368 1368
1369 // m_log.InfoFormat("[PRIMINVENTORY]: " + 1369 // m_log.InfoFormat("[PRIMINVENTORY]: " +
1370 // "Rezzed script {0} into prim local ID {1} for user {2}", 1370 // "Rezzed script {0} into prim local ID {1} for user {2}",
@@ -1430,10 +1430,10 @@ namespace OpenSim.Region.Environment.Scenes
1430 taskItem.PermsMask = 0; 1430 taskItem.PermsMask = 0;
1431 taskItem.AssetID = asset.FullID; 1431 taskItem.AssetID = asset.FullID;
1432 1432
1433 part.AddInventoryItem(taskItem, false); 1433 part.Inventory.AddInventoryItem(taskItem, false);
1434 part.GetProperties(remoteClient); 1434 part.GetProperties(remoteClient);
1435 1435
1436 part.CreateScriptInstance(taskItem, 0, false, DefaultScriptEngine, 0); 1436 part.Inventory.CreateScriptInstance(taskItem, 0, false, DefaultScriptEngine, 0);
1437 } 1437 }
1438 } 1438 }
1439 1439
@@ -1445,7 +1445,7 @@ namespace OpenSim.Region.Environment.Scenes
1445 /// <param name="localID"></param> 1445 /// <param name="localID"></param>
1446 public void RezScript(UUID srcId, SceneObjectPart srcPart, UUID destId, int pin, int running, int start_param) 1446 public void RezScript(UUID srcId, SceneObjectPart srcPart, UUID destId, int pin, int running, int start_param)
1447 { 1447 {
1448 TaskInventoryItem srcTaskItem = srcPart.GetInventoryItem(srcId); 1448 TaskInventoryItem srcTaskItem = srcPart.Inventory.GetInventoryItem(srcId);
1449 1449
1450 if (srcTaskItem == null) 1450 if (srcTaskItem == null)
1451 { 1451 {
@@ -1525,11 +1525,11 @@ namespace OpenSim.Region.Environment.Scenes
1525 destTaskItem.InvType = srcTaskItem.InvType; 1525 destTaskItem.InvType = srcTaskItem.InvType;
1526 destTaskItem.Type = srcTaskItem.Type; 1526 destTaskItem.Type = srcTaskItem.Type;
1527 1527
1528 destPart.AddInventoryItemExclusive(destTaskItem, false); 1528 destPart.Inventory.AddInventoryItemExclusive(destTaskItem, false);
1529 1529
1530 if (running > 0) 1530 if (running > 0)
1531 { 1531 {
1532 destPart.CreateScriptInstance(destTaskItem, 0, false, DefaultScriptEngine, 0); 1532 destPart.Inventory.CreateScriptInstance(destTaskItem, 0, false, DefaultScriptEngine, 0);
1533 } 1533 }
1534 1534
1535 ScenePresence avatar; 1535 ScenePresence avatar;
@@ -2064,7 +2064,7 @@ namespace OpenSim.Region.Environment.Scenes
2064 { 2064 {
2065 part.LastOwnerID = part.OwnerID; 2065 part.LastOwnerID = part.OwnerID;
2066 part.OwnerID = item.Owner; 2066 part.OwnerID = item.Owner;
2067 part.ChangeInventoryOwner(item.Owner); 2067 part.Inventory.ChangeInventoryOwner(item.Owner);
2068 } 2068 }
2069 else if (((item.CurrentPermissions & 8) != 0) && (!attachment)) // Slam! 2069 else if (((item.CurrentPermissions & 8) != 0) && (!attachment)) // Slam!
2070 { 2070 {
@@ -2178,7 +2178,7 @@ namespace OpenSim.Region.Environment.Scenes
2178 { 2178 {
2179 part.LastOwnerID = part.OwnerID; 2179 part.LastOwnerID = part.OwnerID;
2180 part.OwnerID = item.OwnerID; 2180 part.OwnerID = item.OwnerID;
2181 part.ChangeInventoryOwner(item.OwnerID); 2181 part.Inventory.ChangeInventoryOwner(item.OwnerID);
2182 } 2182 }
2183 else if ((item.CurrentPermissions & 8) != 0) // Slam! 2183 else if ((item.CurrentPermissions & 8) != 0) // Slam!
2184 { 2184 {
@@ -2200,7 +2200,7 @@ namespace OpenSim.Region.Environment.Scenes
2200 if (!ExternalChecks.ExternalChecksBypassPermissions()) 2200 if (!ExternalChecks.ExternalChecksBypassPermissions())
2201 { 2201 {
2202 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) 2202 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
2203 sourcePart.RemoveInventoryItem(item.ItemID); 2203 sourcePart.Inventory.RemoveInventoryItem(item.ItemID);
2204 } 2204 }
2205 return rootPart.ParentGroup; 2205 return rootPart.ParentGroup;
2206 } 2206 }
@@ -2368,7 +2368,7 @@ namespace OpenSim.Region.Environment.Scenes
2368 if (part != null && part.ParentGroup != null) 2368 if (part != null && part.ParentGroup != null)
2369 { 2369 {
2370 part.ParentGroup.SetOwnerId(ownerID); 2370 part.ParentGroup.SetOwnerId(ownerID);
2371 part.ChangeInventoryOwner(ownerID); 2371 part.Inventory.ChangeInventoryOwner(ownerID);
2372 part.ParentGroup.SetGroup(groupID, remoteClient); 2372 part.ParentGroup.SetGroup(groupID, remoteClient);
2373 } 2373 }
2374 } 2374 }