aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorOren Hurvitz2014-04-21 15:29:41 +0300
committerOren Hurvitz2014-04-23 14:19:24 +0100
commit617bc4710ab71a97cc1ffa8f4e113c21ecb70d8d (patch)
treee41b43d5d440dda3fae3810a14c949f93767da63 /OpenSim
parentChanged table 'im_offline' to use UTF8 characters. This fixes a problem with ... (diff)
downloadopensim-SC_OLD-617bc4710ab71a97cc1ffa8f4e113c21ecb70d8d.zip
opensim-SC_OLD-617bc4710ab71a97cc1ffa8f4e113c21ecb70d8d.tar.gz
opensim-SC_OLD-617bc4710ab71a97cc1ffa8f4e113c21ecb70d8d.tar.bz2
opensim-SC_OLD-617bc4710ab71a97cc1ffa8f4e113c21ecb70d8d.tar.xz
Workaround for SRAS: if Store Asset returns 'null' then assume the asset already exists, and this isn't an error
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs7
1 files changed, 7 insertions, 0 deletions
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
299 return string.Empty; 299 return string.Empty;
300 } 300 }
301 301
302 // TEMPORARY: SRAS returns 'null' when it's asked to store existing assets
303 if (newID == null)
304 {
305 m_log.DebugFormat("[ASSET CONNECTOR]: Storing of asset {0} returned null; assuming the asset already exists", asset.ID);
306 return asset.ID;
307 }
308
302 if (string.IsNullOrEmpty(newID)) 309 if (string.IsNullOrEmpty(newID))
303 return string.Empty; 310 return string.Empty;
304 311