minor refactor

This commit is contained in:
Justin Clarke Casey
2007-12-22 16:45:44 +00:00
parent e52c217e44
commit ed0f8bd572
4 changed files with 13 additions and 6 deletions

View File

@@ -34,7 +34,7 @@ namespace OpenSim.Framework
{
private Queue<T> _queue = new Queue<T>();
private object _queueSync = new object();
public void Enqueue(T value)
{
lock (_queueSync)

View File

@@ -98,7 +98,12 @@ namespace OpenSim.Framework.Communications.Cache
}
}
public AssetBase GetAsset(LLUUID assetID)
/// <summary>
/// Only get an asset if we already have it in the cache.
/// </summary>
/// <param name="assetID"></param></param>
/// <returns></returns>
private AssetBase GetCachedAsset(LLUUID assetID)
{
AssetBase asset = null;
if (Textures.ContainsKey(assetID))
@@ -153,7 +158,7 @@ namespace OpenSim.Framework.Communications.Cache
public AssetBase GetAsset(LLUUID assetID, bool isTexture)
{
AssetBase asset = GetAsset(assetID);
AssetBase asset = GetCachedAsset(assetID);
if (asset == null)
{
m_assetServer.RequestAsset(assetID, isTexture);
@@ -223,7 +228,7 @@ namespace OpenSim.Framework.Communications.Cache
public AssetBase CopyAsset(LLUUID assetID)
{
AssetBase asset = GetAsset(assetID);
AssetBase asset = GetCachedAsset(assetID);
if (asset == null)
return null;