diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetCache.cs | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index dd9015b..a1d9c73 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs | |||
@@ -270,7 +270,6 @@ namespace OpenSim.Framework.Communications.Cache | |||
270 | // m_log.DebugFormat("[ASSET CACHE]: Adding request for {0} {1}", isTexture ? "texture" : "asset", assetId); | 270 | // m_log.DebugFormat("[ASSET CACHE]: Adding request for {0} {1}", isTexture ? "texture" : "asset", assetId); |
271 | #endif | 271 | #endif |
272 | 272 | ||
273 | |||
274 | NewAssetRequest req = new NewAssetRequest(assetId, callback); | 273 | NewAssetRequest req = new NewAssetRequest(assetId, callback); |
275 | AssetRequestsList requestList; | 274 | AssetRequestsList requestList; |
276 | 275 | ||
@@ -291,28 +290,6 @@ namespace OpenSim.Framework.Communications.Cache | |||
291 | m_assetServer.RequestAsset(assetId, isTexture); | 290 | m_assetServer.RequestAsset(assetId, isTexture); |
292 | } | 291 | } |
293 | } | 292 | } |
294 | |||
295 | |||
296 | /* Old code doesn't handle duplicate requests right | ||
297 | NewAssetRequest req = new NewAssetRequest(assetId, callback); | ||
298 | |||
299 | // Make sure we always have a request list to which to add the asset | ||
300 | AssetRequestsList requestList; | ||
301 | lock (RequestLists) | ||
302 | { | ||
303 | // m_log.Info("AssetCache: Lock taken on requestLists (GetAsset)"); | ||
304 | if (!RequestLists.TryGetValue(assetId, out requestList)) | ||
305 | { | ||
306 | requestList = new AssetRequestsList(assetId); | ||
307 | RequestLists.Add(assetId, requestList); | ||
308 | } | ||
309 | } | ||
310 | // m_log.Info("AssetCache: Lock released on requestLists (GetAsset)"); | ||
311 | |||
312 | requestList.Requests.Add(req); | ||
313 | |||
314 | m_assetServer.RequestAsset(assetId, isTexture); | ||
315 | */ | ||
316 | } | 293 | } |
317 | } | 294 | } |
318 | 295 | ||