Stop the recurring texture requests for textures that truly don't exist.

prioritization
Diva Canto 2009-10-12 17:36:13 -07:00
parent 0cfbdf3894
commit 63ed605eba
1 changed files with 2 additions and 2 deletions

View File

@ -373,14 +373,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
UUID assetID = UUID.Zero; UUID assetID = UUID.Zero;
if (asset != null) if (asset != null)
assetID = asset.FullID; assetID = asset.FullID;
else if (HyperAssets != null) else if ((HyperAssets != null) && (sender != HyperAssets))
{ {
// Try the user's inventory, but only if it's different from the regions' // Try the user's inventory, but only if it's different from the regions'
string userAssets = HyperAssets.GetUserAssetServer(AgentID); string userAssets = HyperAssets.GetUserAssetServer(AgentID);
if ((userAssets != string.Empty) && (userAssets != HyperAssets.GetSimAssetServer())) if ((userAssets != string.Empty) && (userAssets != HyperAssets.GetSimAssetServer()))
{ {
m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", id); m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", id);
AssetService.Get(userAssets + "/" + id, this, AssetReceived); AssetService.Get(userAssets + "/" + id, HyperAssets, AssetReceived);
return; return;
} }
} }