OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

afrisby
MW 2007-11-01 17:28:38 +00:00
parent 88f04731ca
commit 7a66eff8af
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/Communications/Cache/AssetCache.cs
View File

@ -161,7 +161,7 @@ namespace OpenSim.Framework.Communications.Cache
RequestLists.Add(assetID, reqList); 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); AssetBase asset = GetAsset(assetID);
if (asset == null) if (asset == null)
{ {
_assetServer.FetchAsset(assetID, isTexture); _assetServer.RequestAsset(assetID, isTexture);
} }
return asset; return asset;
} }
@ -409,7 +409,7 @@ namespace OpenSim.Framework.Communications.Cache
request.AssetRequestSource = source; request.AssetRequestSource = source;
request.Params = transferRequest.TransferInfo.Params; request.Params = transferRequest.TransferInfo.Params;
RequestedAssets.Add(requestID, request); RequestedAssets.Add(requestID, request);
_assetServer.FetchAsset(requestID, false); _assetServer.RequestAsset(requestID, false);
} }
return; return;
} }
@ -576,7 +576,7 @@ namespace OpenSim.Framework.Communications.Cache
request.IsTextureRequest = true; request.IsTextureRequest = true;
request.DiscardLevel = discard; request.DiscardLevel = discard;
RequestedTextures.Add(imageID, request); RequestedTextures.Add(imageID, request);
_assetServer.FetchAsset(imageID, true); _assetServer.RequestAsset(imageID, true);
} }
return; return;
} }

2
OpenSim/Framework/Communications/Cache/AssetServerBase.cs
View File

@ -66,7 +66,7 @@ namespace OpenSim.Framework.Communications.Cache
_receiver = receiver; _receiver = receiver;
} }
public void FetchAsset(LLUUID assetID, bool isTexture) public void RequestAsset(LLUUID assetID, bool isTexture)
{ {
ARequest req = new ARequest(); ARequest req = new ARequest();
req.AssetID = assetID; req.AssetID = assetID;

2
OpenSim/Framework/IAssetServer.cs
View File

@ -37,7 +37,7 @@ namespace OpenSim.Framework
public interface IAssetServer public interface IAssetServer
{ {
void SetReceiver(IAssetReceiver receiver); void SetReceiver(IAssetReceiver receiver);
void FetchAsset(LLUUID assetID, bool isTexture); void RequestAsset(LLUUID assetID, bool isTexture);
void UpdateAsset(AssetBase asset); void UpdateAsset(AssetBase asset);
void StoreAndCommitAsset(AssetBase asset); void StoreAndCommitAsset(AssetBase asset);
void Close(); void Close();