ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor asset handling as per Ubit's suggestion

Browse Source
This commit is contained in:
Melanie Thielker
2017-02-01 16:31:01 +00:00
parent 5ceb315e34
commit a5151bb337
12 changed files with 75 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/IAssetCache.cs
View File

@@ -47,8 +47,9 @@ namespace OpenSim.Framework
/// Get an asset by its id.
/// </summary>
/// <param name='id'></param>
/// <returns>null if the asset does not exist.</returns>
AssetBase Get(string id, out bool negative);
/// <param name='asset'>Will be set to null if no asset was found</param>
/// <returns>False if the asset has been negative-cached</returns>
bool Get(string id, out AssetBase asset);
/// <summary>
/// Check whether an asset with the specified id exists in the cache.

4
OpenSim/Framework/WearableCacheItem.cs
View File

@@ -113,8 +113,8 @@ namespace OpenSim.Framework
{
if (dataCache.Check(item.TextureID.ToString()))
{
bool negative;
AssetBase assetItem = dataCache.Get(item.TextureID.ToString(), out negative);
AssetBase assetItem;
dataCache.Get(item.TextureID.ToString(), out assetItem);
if (assetItem != null)
{
itemmap.Add("assetdata", OSD.FromBinary(assetItem.Data));