diff options
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 'OpenSim/Framework/Communications')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetCache.cs | 8 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetServerBase.cs | 2 |
2 files changed, 5 insertions, 5 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; |