From 7a66eff8af0d9d56ffb3b2c1f4f5088f98c99d64 Mon Sep 17 00:00:00 2001 From: MW Date: Thu, 1 Nov 2007 17:28:38 +0000 Subject: renamed FetchAsset to RequestAsset on IAssetServer, as think its a more fitting name. As the call shouldn't actually return the data, but just add a request for the data to be sent back via the callback. --- OpenSim/Framework/Communications/Cache/AssetCache.cs | 8 ++++---- OpenSim/Framework/Communications/Cache/AssetServerBase.cs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'OpenSim/Framework/Communications') diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index 5457d14..6222649 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs @@ -161,7 +161,7 @@ namespace OpenSim.Framework.Communications.Cache RequestLists.Add(assetID, reqList); } } - _assetServer.FetchAsset(assetID, false); + _assetServer.RequestAsset(assetID, false); } } @@ -171,7 +171,7 @@ namespace OpenSim.Framework.Communications.Cache AssetBase asset = GetAsset(assetID); if (asset == null) { - _assetServer.FetchAsset(assetID, isTexture); + _assetServer.RequestAsset(assetID, isTexture); } return asset; } @@ -409,7 +409,7 @@ namespace OpenSim.Framework.Communications.Cache request.AssetRequestSource = source; request.Params = transferRequest.TransferInfo.Params; RequestedAssets.Add(requestID, request); - _assetServer.FetchAsset(requestID, false); + _assetServer.RequestAsset(requestID, false); } return; } @@ -576,7 +576,7 @@ namespace OpenSim.Framework.Communications.Cache request.IsTextureRequest = true; request.DiscardLevel = discard; RequestedTextures.Add(imageID, request); - _assetServer.FetchAsset(imageID, true); + _assetServer.RequestAsset(imageID, true); } return; } diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs index 7c9df88..128e2e6 100644 --- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs +++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs @@ -66,7 +66,7 @@ namespace OpenSim.Framework.Communications.Cache _receiver = receiver; } - public void FetchAsset(LLUUID assetID, bool isTexture) + public void RequestAsset(LLUUID assetID, bool isTexture) { ARequest req = new ARequest(); req.AssetID = assetID; -- cgit v1.1