diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 7384e39..57c9d7c 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -640,7 +640,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
640 | // Every month or so this will wrap and give bad numbers, not really a problem | 640 | // Every month or so this will wrap and give bad numbers, not really a problem |
641 | // since its just for reporting | 641 | // since its just for reporting |
642 | int tickdiff = requestEndTick - requestStartTick; | 642 | int tickdiff = requestEndTick - requestStartTick; |
643 | if (tickdiff > 3000) | 643 | if (tickdiff > 3000 && requestHandler.Name != "GetTexture") |
644 | { | 644 | { |
645 | m_log.InfoFormat( | 645 | m_log.InfoFormat( |
646 | "[BASE HTTP SERVER]: Slow handling of {0} {1} {2} {3} from {4} took {5}ms", | 646 | "[BASE HTTP SERVER]: Slow handling of {0} {1} {2} {3} from {4} took {5}ms", |
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs index 9e04601..daf38bc 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | |||
@@ -193,7 +193,7 @@ namespace OpenSim.Services.Connectors | |||
193 | if (asset == null || asset.Data == null || asset.Data.Length == 0) | 193 | if (asset == null || asset.Data == null || asset.Data.Length == 0) |
194 | { | 194 | { |
195 | asset = SynchronousRestObjectRequester. | 195 | asset = SynchronousRestObjectRequester. |
196 | MakeRequest<int, AssetBase>("GET", uri, 0); | 196 | MakeRequest<int, AssetBase>("GET", uri, 0, 30); |
197 | 197 | ||
198 | if (m_Cache != null) | 198 | if (m_Cache != null) |
199 | m_Cache.Cache(asset); | 199 | m_Cache.Cache(asset); |
@@ -321,7 +321,7 @@ namespace OpenSim.Services.Connectors | |||
321 | h.Invoke(a); | 321 | h.Invoke(a); |
322 | if (handlers != null) | 322 | if (handlers != null) |
323 | handlers.Clear(); | 323 | handlers.Clear(); |
324 | }); | 324 | }, 30); |
325 | 325 | ||
326 | success = true; | 326 | success = true; |
327 | } | 327 | } |