aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2009-10-12 17:36:13 -0700
committerDiva Canto2009-10-12 17:36:13 -0700
commit63ed605eba7d4655bbbf956cef0d6e6b02b4a64e (patch)
tree809ed45e6020199ea57822da0b7935cf3392cdc9
parentAdded this one file for the previous commit to work. (diff)
downloadopensim-SC_OLD-63ed605eba7d4655bbbf956cef0d6e6b02b4a64e.zip
opensim-SC_OLD-63ed605eba7d4655bbbf956cef0d6e6b02b4a64e.tar.gz
opensim-SC_OLD-63ed605eba7d4655bbbf956cef0d6e6b02b4a64e.tar.bz2
opensim-SC_OLD-63ed605eba7d4655bbbf956cef0d6e6b02b4a64e.tar.xz
Stop the recurring texture requests for textures that truly don't exist.
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
index 1bbe00f..bb98f24 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
@@ -373,14 +373,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
373 UUID assetID = UUID.Zero; 373 UUID assetID = UUID.Zero;
374 if (asset != null) 374 if (asset != null)
375 assetID = asset.FullID; 375 assetID = asset.FullID;
376 else if (HyperAssets != null) 376 else if ((HyperAssets != null) && (sender != HyperAssets))
377 { 377 {
378 // Try the user's inventory, but only if it's different from the regions' 378 // Try the user's inventory, but only if it's different from the regions'
379 string userAssets = HyperAssets.GetUserAssetServer(AgentID); 379 string userAssets = HyperAssets.GetUserAssetServer(AgentID);
380 if ((userAssets != string.Empty) && (userAssets != HyperAssets.GetSimAssetServer())) 380 if ((userAssets != string.Empty) && (userAssets != HyperAssets.GetSimAssetServer()))
381 { 381 {
382 m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", id); 382 m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", id);
383 AssetService.Get(userAssets + "/" + id, this, AssetReceived); 383 AssetService.Get(userAssets + "/" + id, HyperAssets, AssetReceived);
384 return; 384 return;
385 } 385 }
386 } 386 }