aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs39
1 files changed, 19 insertions, 20 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index dd3208a..6d7559e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1473,26 +1473,25 @@ namespace OpenSim.Region.Framework.Scenes
1473// "[PRIM INVENTORY]: Updating item {0} in {1} for UpdateTaskInventory()", 1473// "[PRIM INVENTORY]: Updating item {0} in {1} for UpdateTaskInventory()",
1474// currentItem.Name, part.Name); 1474// currentItem.Name, part.Name);
1475 1475
1476 // Viewers from at least Linden Lab 1.23 onwards use a capability to update script contents rather 1476 // Only look for an uploaded updated asset if we are passed a transaction ID. This is only the
1477 // than UDP. With viewers from at least 1.23 onwards, changing properties on scripts (e.g. renaming) causes 1477 // case for updates uploded through UDP. Updates uploaded via a capability (e.g. a script update)
1478 // this to spew spurious errors and "thing saved" messages. 1478 // will not pass in a transaction ID in the update message.
1479 // Rather than retaining complexity in the code and removing useful error messages, I'm going to 1479 if (transactionID != UUID.Zero)
1480 // comment this section out. If this was still working for very old viewers and there is 1480 {
1481 // a large population using them which cannot upgrade to 1.23 or derivatives then we can revisit 1481 IAgentAssetTransactions agentTransactions = this.RequestModuleInterface<IAgentAssetTransactions>();
1482 // this - justincc 1482 if (agentTransactions != null)
1483// IAgentAssetTransactions agentTransactions = this.RequestModuleInterface<IAgentAssetTransactions>(); 1483 {
1484// if (agentTransactions != null) 1484 agentTransactions.HandleTaskItemUpdateFromTransaction(
1485// { 1485 remoteClient, part, transactionID, currentItem);
1486// agentTransactions.HandleTaskItemUpdateFromTransaction( 1486
1487// remoteClient, part, transactionID, currentItem); 1487 if ((InventoryType)itemInfo.InvType == InventoryType.Notecard)
1488// 1488 remoteClient.SendAgentAlertMessage("Notecard saved", false);
1489// if ((InventoryType)itemInfo.InvType == InventoryType.Notecard) 1489 else if ((InventoryType)itemInfo.InvType == InventoryType.LSL)
1490// remoteClient.SendAgentAlertMessage("Notecard saved", false); 1490 remoteClient.SendAgentAlertMessage("Script saved", false);
1491// else if ((InventoryType)itemInfo.InvType == InventoryType.LSL) 1491 else
1492// remoteClient.SendAgentAlertMessage("Script saved", false); 1492 remoteClient.SendAgentAlertMessage("Item saved", false);
1493// else 1493 }
1494// remoteClient.SendAgentAlertMessage("Item saved", false); 1494 }
1495// }
1496 1495
1497 // Base ALWAYS has move 1496 // Base ALWAYS has move
1498 currentItem.BasePermissions |= (uint)PermissionMask.Move; 1497 currentItem.BasePermissions |= (uint)PermissionMask.Move;