From 2b49cb922799aadcdb93225d74735fcf7da94bbd Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sat, 3 Jul 2010 06:09:20 -0700
Subject: [PATCH] Make sure the AssetServiceConnector times out within 30
 seconds. If it doesn't, the client will get bored and give an upload error,
 instead of granting success and entering the asset into our retry queue.

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

diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index e63dd50d64..1f40312d74 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -269,8 +269,8 @@ namespace OpenSim.Services.Connectors
             try
             {
                 newID = SynchronousRestObjectRequester.
-                        MakeRequest<AssetBase, string>("POST", uri, asset);
-                if (newID == null)
+                        MakeRequest<AssetBase, string>("POST", uri, asset, 25);
+                if (newID == null || newID == "")
                 {
                     newID = UUID.Zero.ToString();
                 }