From 060d6fe8f4eba0c1b1c0cb4f52acd2fd59725c66 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 14 Sep 2012 00:11:23 +0200
Subject: Allow setting max connections for an endpoint

---
 OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs      | 2 +-
 OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index ff57422..d5bc3c3 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -648,7 +648,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                 // Every month or so this will wrap and give bad numbers, not really a problem
                 // since its just for reporting
                 int tickdiff = requestEndTick - requestStartTick;
-                if (tickdiff > 3000)
+                if (tickdiff > 3000 && requestHandler.Name != "GetTexture")
                 {
                     m_log.InfoFormat(
                         "[BASE HTTP SERVER]: Slow handling of {0} {1} {2} {3} {4} from {5} took {6}ms",
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index e4c3eaf..086b5ad 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -108,7 +108,7 @@ namespace OpenSim.Services.Connectors
             if (asset == null)
             {
                 asset = SynchronousRestObjectRequester.
-                        MakeRequest<int, AssetBase>("GET", uri, 0);
+                        MakeRequest<int, AssetBase>("GET", uri, 0, 30);
 
                 if (m_Cache != null)
                     m_Cache.Cache(asset);
@@ -221,7 +221,7 @@ namespace OpenSim.Services.Connectors
                                 m_AssetHandlers.Remove(id);
                             }
                             handlers.Invoke(a);
-                        });
+                        }, 30);
                     
                     success = true;
                 }
@@ -326,4 +326,4 @@ namespace OpenSim.Services.Connectors
             return false;
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1