aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs')
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs8
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 4b502b7..7f32ad3 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -52,8 +52,6 @@ namespace OpenSim.Services.Connectors
52 private int m_retryCounter; 52 private int m_retryCounter;
53 private Dictionary<int, List<AssetBase>> m_retryQueue = new Dictionary<int, List<AssetBase>>(); 53 private Dictionary<int, List<AssetBase>> m_retryQueue = new Dictionary<int, List<AssetBase>>();
54 private System.Timers.Timer m_retryTimer; 54 private System.Timers.Timer m_retryTimer;
55 private int m_maxAssetRequestConcurrency = 30;
56
57 private delegate void AssetRetrievedEx(AssetBase asset); 55 private delegate void AssetRetrievedEx(AssetBase asset);
58 56
59 // Keeps track of concurrent requests for the same asset, so that it's only loaded once. 57 // Keeps track of concurrent requests for the same asset, so that it's only loaded once.
@@ -82,10 +80,6 @@ namespace OpenSim.Services.Connectors
82 80
83 public virtual void Initialise(IConfigSource source) 81 public virtual void Initialise(IConfigSource source)
84 { 82 {
85 IConfig netconfig = source.Configs["Network"];
86 if (netconfig != null)
87 m_maxAssetRequestConcurrency = netconfig.GetInt("MaxRequestConcurrency",m_maxAssetRequestConcurrency);
88
89 IConfig assetConfig = source.Configs["AssetService"]; 83 IConfig assetConfig = source.Configs["AssetService"];
90 if (assetConfig == null) 84 if (assetConfig == null)
91 { 85 {
@@ -210,7 +204,7 @@ namespace OpenSim.Services.Connectors
210 if (asset == null || asset.Data == null || asset.Data.Length == 0) 204 if (asset == null || asset.Data == null || asset.Data.Length == 0)
211 { 205 {
212 asset = SynchronousRestObjectRequester. 206 asset = SynchronousRestObjectRequester.
213 MakeRequest<int, AssetBase>("GET", uri, 0, m_maxAssetRequestConcurrency); 207 MakeRequest<int, AssetBase>("GET", uri, 0, 30);
214 208
215 if (m_Cache != null) 209 if (m_Cache != null)
216 m_Cache.Cache(asset); 210 m_Cache.Cache(asset);