From 617bc4710ab71a97cc1ffa8f4e113c21ecb70d8d Mon Sep 17 00:00:00 2001 From: Oren Hurvitz Date: Mon, 21 Apr 2014 15:29:41 +0300 Subject: Workaround for SRAS: if Store Asset returns 'null' then assume the asset already exists, and this isn't an error --- OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'OpenSim') diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs index 910c0d7..ee047e0 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs @@ -299,6 +299,13 @@ namespace OpenSim.Services.Connectors return string.Empty; } + // TEMPORARY: SRAS returns 'null' when it's asked to store existing assets + if (newID == null) + { + m_log.DebugFormat("[ASSET CONNECTOR]: Storing of asset {0} returned null; assuming the asset already exists", asset.ID); + return asset.ID; + } + if (string.IsNullOrEmpty(newID)) return string.Empty; -- cgit v1.1