diff options
author | Justin Clark-Casey (justincc) | 2011-04-28 22:59:12 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-04-28 22:59:12 +0100 |
commit | cd7517ccb9d522f5fecd57523285a0b17c147620 (patch) | |
tree | 5037e4156222edc23fd1b1fddc4e1ebc7ee3eb27 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
parent | Fix a bug where physical objects rezzed with an initial velocity by script do... (diff) | |
download | opensim-SC-cd7517ccb9d522f5fecd57523285a0b17c147620.zip opensim-SC-cd7517ccb9d522f5fecd57523285a0b17c147620.tar.gz opensim-SC-cd7517ccb9d522f5fecd57523285a0b17c147620.tar.bz2 opensim-SC-cd7517ccb9d522f5fecd57523285a0b17c147620.tar.xz |
Stop CHANGED_INVENTORY firing twice if a notecard is edited in prim.
Addresses http://opensimulator.org/mantis/view.php?id=5444
Fix is to stop the asset transaction calling UpdateInventoryItem() since the caller is doing it anyway, which is more correct.
This did not effect scripts.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 0b2b01a..b0f0de6 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1430,6 +1430,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1430 | } | 1430 | } |
1431 | else // Updating existing item with new perms etc | 1431 | else // Updating existing item with new perms etc |
1432 | { | 1432 | { |
1433 | // m_log.DebugFormat( | ||
1434 | // "[PRIM INVENTORY]: Updating item {0} in {1} for UpdateTaskInventory()", | ||
1435 | // currentItem.Name, part.Name); | ||
1436 | |||
1433 | IAgentAssetTransactions agentTransactions = this.RequestModuleInterface<IAgentAssetTransactions>(); | 1437 | IAgentAssetTransactions agentTransactions = this.RequestModuleInterface<IAgentAssetTransactions>(); |
1434 | if (agentTransactions != null) | 1438 | if (agentTransactions != null) |
1435 | { | 1439 | { |