From 7a66eff8af0d9d56ffb3b2c1f4f5088f98c99d64 Mon Sep 17 00:00:00 2001
From: MW <Michaelwri22@yahoo.co.uk>
Date: Thu, 1 Nov 2007 17:28:38 +0000
Subject: [PATCH] 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 +-
 OpenSim/Framework/IAssetServer.cs                         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 5457d14a4d..622264922f 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 7c9df8851f..128e2e601d 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;
diff --git a/OpenSim/Framework/IAssetServer.cs b/OpenSim/Framework/IAssetServer.cs
index 9a7dbab5fe..a3553c4ba3 100644
--- a/OpenSim/Framework/IAssetServer.cs
+++ b/OpenSim/Framework/IAssetServer.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework
     public interface IAssetServer
     {
         void SetReceiver(IAssetReceiver receiver);
-        void FetchAsset(LLUUID assetID, bool isTexture);
+        void RequestAsset(LLUUID assetID, bool isTexture);
         void UpdateAsset(AssetBase asset);
         void StoreAndCommitAsset(AssetBase asset);
         void Close();