ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Handle failed asset stores for InventoryAccessModule

Browse Source 
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
This commit is contained in:
Vincent Sylvester
2026-06-30 10:58:32 +02:00
committed by UbitUmarov
parent 4a356cba5e
commit da6a36c26d
1 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
View File

@@ -412,12 +412,25 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
AssetBase asset = CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data, remoteClient.AgentId.ToString());
item.AssetID = asset.FullID;
m_Scene.AssetService.Store(asset);
m_Scene.InventoryService.UpdateItem(item);
// remoteClient.SendInventoryItemCreateUpdate(item);
return (asset.FullID);
if (m_Scene.AssetService.Store(asset).Equals(string.Empty))
{
m_log.WarnFormat("[INVENTORY ACCESS MODULE]: Asset with id {0} failed to store, retrying...", asset.ID.ToString());
if (m_Scene.AssetService.Store(asset).Equals(string.Empty))
{
m_log.ErrorFormat("[INVENTORY ACCESS MODULE]: Asset with id {0} failed to store!", asset.ID.ToString());
return UUID.Zero;
}
else
{
m_Scene.InventoryService.UpdateItem(item);
return (asset.FullID);
}
}
else
{
m_Scene.InventoryService.UpdateItem(item);
return UUID.Zero;
}
}
public virtual bool UpdateInventoryItemAsset(UUID ownerID, InventoryItemBase item, AssetBase asset)
@@ -428,9 +441,25 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
// "[INVENTORY ACCESS MODULE]: Updating item {0} {1} with new asset {2}",
// item.Name, item.ID, asset.ID);
m_Scene.AssetService.Store(asset);
m_Scene.InventoryService.UpdateItem(item);
return true;
if (m_Scene.AssetService.Store(asset).Equals(string.Empty))
{
m_log.WarnFormat("[INVENTORY ACCESS MODULE]: Asset with id {0} failed to store, retrying...", asset.ID.ToString());
if (m_Scene.AssetService.Store(asset).Equals(string.Empty))
{
m_log.ErrorFormat("[INVENTORY ACCESS MODULE]: Asset with id {0} failed to store!", asset.ID.ToString());
return false;
}
else
{
m_Scene.InventoryService.UpdateItem(item);
return true;
}
}
else
{
m_Scene.InventoryService.UpdateItem(item);
return true;
}
}
else
{