revert SynchronousRestObjectRequester timeout to miliseconds, and fix where it was wrong set in seconds

2 files changed, 3 insertions, 3 deletions

diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index f834baa..3436984 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -1246,7 +1246,7 @@ namespace OpenSim.Framework
                 auth.AddAuthorization(ht.Headers);
 
             if (pTimeout != 0)
-                request.Timeout = pTimeout * 1000;
+                request.Timeout = pTimeout;
 
             if (maxConnections > 0 && ht.ServicePoint.ConnectionLimit < maxConnections)
                 ht.ServicePoint.ConnectionLimit = maxConnections;
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 8f3cb80..8529f92 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -322,7 +322,7 @@ namespace OpenSim.Services.Connectors
                 bool success = false;
                 try
                 {
-                    AssetBase a = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0, 30);
+                    AssetBase a = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0, 30000);
                     if (a != null)
                     {
                         if (m_Cache != null)
@@ -481,7 +481,7 @@ namespace OpenSim.Services.Connectors
             try
             {
                 newID = SynchronousRestObjectRequester.
-                        MakeRequest<AssetBase, string>("POST", uri, asset, 100);
+                        MakeRequest<AssetBase, string>("POST", uri, asset, 100000);
                 if (newID == null || newID == "")
                 {
                     newID = UUID.Zero.ToString();