Comment out xfer section in Scene.UpdateTaskInventory() which was causing spurious errors and "script saved" messages when script properties were changed.

Viewers since at least Linden Lab 1.23 use the script upload capability to save script changes.
It's unknown whether the commented out code was working for very old viewers or not.
Code is commented out to reduce complexity and so that useful error messages don't need to be removed.
If there is a substantial population using extremely old viewers that can't upgrade to a newer version 1 viewer (e.g. 1.23) or similar TPV then this can be revisited.
0.7.2-post-fixes
Justin Clark-Casey (justincc) 2012-01-28 00:39:53 +00:00
parent 7dd0b7ea2f
commit 0a277a64a7
1 changed files with 20 additions and 13 deletions

View File

@ -1449,20 +1449,27 @@ namespace OpenSim.Region.Framework.Scenes
// m_log.DebugFormat( // m_log.DebugFormat(
// "[PRIM INVENTORY]: Updating item {0} in {1} for UpdateTaskInventory()", // "[PRIM INVENTORY]: Updating item {0} in {1} for UpdateTaskInventory()",
// currentItem.Name, part.Name); // currentItem.Name, part.Name);
IAgentAssetTransactions agentTransactions = this.RequestModuleInterface<IAgentAssetTransactions>();
if (agentTransactions != null)
{
agentTransactions.HandleTaskItemUpdateFromTransaction(
remoteClient, part, transactionID, currentItem);
if ((InventoryType)itemInfo.InvType == InventoryType.Notecard) // Viewers from at least Linden Lab 1.23 onwards use a capability to update script contents rather
remoteClient.SendAgentAlertMessage("Notecard saved", false); // than UDP. With viewers from at least 1.23 onwards, changing properties on scripts (e.g. renaming) causes
else if ((InventoryType)itemInfo.InvType == InventoryType.LSL) // this to spew spurious errors and "thing saved" messages.
remoteClient.SendAgentAlertMessage("Script saved", false); // Rather than retaining complexity in the code and removing useful error messages, I'm going to
else // comment this section out. If this was still working for very old viewers and there is
remoteClient.SendAgentAlertMessage("Item saved", false); // a large population using them which cannot upgrade to 1.23 or derivatives then we can revisit
} // this - justincc
// IAgentAssetTransactions agentTransactions = this.RequestModuleInterface<IAgentAssetTransactions>();
// if (agentTransactions != null)
// {
// agentTransactions.HandleTaskItemUpdateFromTransaction(
// remoteClient, part, transactionID, currentItem);
//
// if ((InventoryType)itemInfo.InvType == InventoryType.Notecard)
// remoteClient.SendAgentAlertMessage("Notecard saved", false);
// else if ((InventoryType)itemInfo.InvType == InventoryType.LSL)
// remoteClient.SendAgentAlertMessage("Script saved", false);
// else
// remoteClient.SendAgentAlertMessage("Item saved", false);
// }
// Base ALWAYS has move // Base ALWAYS has move
currentItem.BasePermissions |= (uint)PermissionMask.Move; currentItem.BasePermissions |= (uint)PermissionMask.Move;