From 1cb7695fb0bcdcbdbb6f2a410fd9f337438afef7 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Thu, 1 Jul 2010 08:48:02 -0700
Subject: [PATCH] Catch newid == null which is what happens if the asset
 service is offline (seems a connection failure does not throw an exception)

---
 OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index ae600bb6e7..bc56963991 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -271,6 +271,10 @@ namespace OpenSim.Services.Connectors
             {
                 newID = SynchronousRestObjectRequester.
                         MakeRequest<AssetBase, string>("POST", uri, asset);
+                if (newID == null)
+                {
+                    newID = UUID.Zero.ToString();
+                }
             }
             catch (Exception e)
             {