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.
parent
88f04731ca
commit
7a66eff8af
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in New Issue