Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

1 files changed, 8 insertions, 0 deletions

diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index ae600bb..94acd6c 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)
             {
@@ -301,6 +305,10 @@ namespace OpenSim.Services.Connectors
             }
             else
             {
+                if (asset.UploadAttempts > 0)
+                {
+                    m_log.InfoFormat("[Assets] Upload of {0} succeeded after {1} failed attempts", asset.ID.ToString(), asset.UploadAttempts.ToString());
+                }
                 if (newID != String.Empty)
                 {
                     // Placing this here, so that this work with old asset servers that don't send any reply back