aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-06-05 16:14:22 +0000
committerJustin Clarke Casey2009-06-05 16:14:22 +0000
commit593942b195cb5b29b47bd077cf53c32699fd2ff8 (patch)
treec2fc437583fd03468446f3680de41336bf62e8b3 /OpenSim/Region
parent* Add oar saving timeout (diff)
downloadopensim-SC_OLD-593942b195cb5b29b47bd077cf53c32699fd2ff8.zip
opensim-SC_OLD-593942b195cb5b29b47bd077cf53c32699fd2ff8.tar.gz
opensim-SC_OLD-593942b195cb5b29b47bd077cf53c32699fd2ff8.tar.bz2
opensim-SC_OLD-593942b195cb5b29b47bd077cf53c32699fd2ff8.tar.xz
* Fix problem where known missing assets would stop save oar ever completing
* Issue was that region server was silently dropping an XmlException caused by trying to deserialize the blank asset service response * So make asset service return http status NOT FOUND rather than OK in accordance with REST * and interpret this correctly in the async response so that a null object is sent back * This means that this fix won't be active until both region simulator and server reach this revision
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index 14804a4..fbb9a00 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -228,12 +228,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver
228 } 228 }
229 229
230 if (asset != null) 230 if (asset != null)
231 { 231 {
232// m_log.DebugFormat("[ARCHIVER]: Recording asset {0} as found", id);
232 m_foundAssetUuids.Add(asset.FullID); 233 m_foundAssetUuids.Add(asset.FullID);
233 m_assetsArchiver.WriteAsset(asset); 234 m_assetsArchiver.WriteAsset(asset);
234 } 235 }
235 else 236 else
236 { 237 {
238// m_log.DebugFormat("[ARCHIVER]: Recording asset {0} as not found", id);
237 m_notFoundAssetUuids.Add(new UUID(id)); 239 m_notFoundAssetUuids.Add(new UUID(id));
238 } 240 }
239 241