diff options
author | UbitUmarov | 2015-09-12 02:05:52 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-12 02:05:52 +0100 |
commit | 8621abf2b7dd124df053c93ac9c02a954393d330 (patch) | |
tree | 1bb5ff0cc7fafdf6702f14693ddc39cc0bea0b77 /OpenSim/Region/CoreModules/Agent | |
parent | put back diva's cache with her recent fix but also avoid duplicated Inventor... (diff) | |
download | opensim-SC-8621abf2b7dd124df053c93ac9c02a954393d330.zip opensim-SC-8621abf2b7dd124df053c93ac9c02a954393d330.tar.gz opensim-SC-8621abf2b7dd124df053c93ac9c02a954393d330.tar.bz2 opensim-SC-8621abf2b7dd124df053c93ac9c02a954393d330.tar.xz |
send a reply on UpdateInventoryItem with the transactionID viewer sent. Protocol seems to have also a callbackID on this, apparently ignored by viewers ( as possible the transactionID )
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent')
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs index fabb409..c14e89f 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | |||
@@ -415,6 +415,8 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
415 | m_Scene.InventoryService.UpdateItem(item); | 415 | m_Scene.InventoryService.UpdateItem(item); |
416 | } | 416 | } |
417 | 417 | ||
418 | ourClient.SendInventoryItemCreateUpdate(item, m_transactionID, 0); | ||
419 | |||
418 | m_transactions.RemoveXferUploader(m_transactionID); | 420 | m_transactions.RemoveXferUploader(m_transactionID); |
419 | 421 | ||
420 | m_Scene.EventManager.TriggerOnNewInventoryItemUploadComplete(ourClient.AgentId, (AssetType)type, m_asset.FullID, m_asset.Name, 0); | 422 | m_Scene.EventManager.TriggerOnNewInventoryItemUploadComplete(ourClient.AgentId, (AssetType)type, m_asset.FullID, m_asset.Name, 0); |
@@ -463,7 +465,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
463 | item.ID, item.AssetID); | 465 | item.ID, item.AssetID); |
464 | 466 | ||
465 | if (m_Scene.AddInventoryItem(item)) | 467 | if (m_Scene.AddInventoryItem(item)) |
466 | ourClient.SendInventoryItemCreateUpdate(item, callbackID); | 468 | ourClient.SendInventoryItemCreateUpdate(item, m_transactionID, callbackID); |
467 | else | 469 | else |
468 | ourClient.SendAlertMessage("Unable to create inventory item"); | 470 | ourClient.SendAlertMessage("Unable to create inventory item"); |
469 | 471 | ||