aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMW2007-11-01 17:28:38 +0000
committerMW2007-11-01 17:28:38 +0000
commit7a66eff8af0d9d56ffb3b2c1f4f5088f98c99d64 (patch)
tree807894255a6f0b890816211a3c4ba18abe3d33f2 /OpenSim
parentTest on the grid asset problem, don't update to this version unless you just ... (diff)
downloadopensim-SC_OLD-7a66eff8af0d9d56ffb3b2c1f4f5088f98c99d64.zip
opensim-SC_OLD-7a66eff8af0d9d56ffb3b2c1f4f5088f98c99d64.tar.gz
opensim-SC_OLD-7a66eff8af0d9d56ffb3b2c1f4f5088f98c99d64.tar.bz2
opensim-SC_OLD-7a66eff8af0d9d56ffb3b2c1f4f5088f98c99d64.tar.xz
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.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs8
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServerBase.cs2
-rw-r--r--OpenSim/Framework/IAssetServer.cs2
3 files changed, 6 insertions, 6 deletions
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
161 RequestLists.Add(assetID, reqList); 161 RequestLists.Add(assetID, reqList);
162 } 162 }
163 } 163 }
164 _assetServer.FetchAsset(assetID, false); 164 _assetServer.RequestAsset(assetID, false);
165 } 165 }
166 } 166 }
167 167
@@ -171,7 +171,7 @@ namespace OpenSim.Framework.Communications.Cache
171 AssetBase asset = GetAsset(assetID); 171 AssetBase asset = GetAsset(assetID);
172 if (asset == null) 172 if (asset == null)
173 { 173 {
174 _assetServer.FetchAsset(assetID, isTexture); 174 _assetServer.RequestAsset(assetID, isTexture);
175 } 175 }
176 return asset; 176 return asset;
177 } 177 }
@@ -409,7 +409,7 @@ namespace OpenSim.Framework.Communications.Cache
409 request.AssetRequestSource = source; 409 request.AssetRequestSource = source;
410 request.Params = transferRequest.TransferInfo.Params; 410 request.Params = transferRequest.TransferInfo.Params;
411 RequestedAssets.Add(requestID, request); 411 RequestedAssets.Add(requestID, request);
412 _assetServer.FetchAsset(requestID, false); 412 _assetServer.RequestAsset(requestID, false);
413 } 413 }
414 return; 414 return;
415 } 415 }
@@ -576,7 +576,7 @@ namespace OpenSim.Framework.Communications.Cache
576 request.IsTextureRequest = true; 576 request.IsTextureRequest = true;
577 request.DiscardLevel = discard; 577 request.DiscardLevel = discard;
578 RequestedTextures.Add(imageID, request); 578 RequestedTextures.Add(imageID, request);
579 _assetServer.FetchAsset(imageID, true); 579 _assetServer.RequestAsset(imageID, true);
580 } 580 }
581 return; 581 return;
582 } 582 }
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
66 _receiver = receiver; 66 _receiver = receiver;
67 } 67 }
68 68
69 public void FetchAsset(LLUUID assetID, bool isTexture) 69 public void RequestAsset(LLUUID assetID, bool isTexture)
70 { 70 {
71 ARequest req = new ARequest(); 71 ARequest req = new ARequest();
72 req.AssetID = assetID; 72 req.AssetID = assetID;
diff --git a/OpenSim/Framework/IAssetServer.cs b/OpenSim/Framework/IAssetServer.cs
index 9a7dbab..a3553c4 100644
--- a/OpenSim/Framework/IAssetServer.cs
+++ b/OpenSim/Framework/IAssetServer.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework
37 public interface IAssetServer 37 public interface IAssetServer
38 { 38 {
39 void SetReceiver(IAssetReceiver receiver); 39 void SetReceiver(IAssetReceiver receiver);
40 void FetchAsset(LLUUID assetID, bool isTexture); 40 void RequestAsset(LLUUID assetID, bool isTexture);
41 void UpdateAsset(AssetBase asset); 41 void UpdateAsset(AssetBase asset);
42 void StoreAndCommitAsset(AssetBase asset); 42 void StoreAndCommitAsset(AssetBase asset);
43 void Close(); 43 void Close();