aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
authorlbsa712008-02-20 13:11:19 +0000
committerlbsa712008-02-20 13:11:19 +0000
commit4c6e5a5090f847aa8944bd06168b45af8fcec3bf (patch)
tree2a2dddd48c11c635b9181170ae506f5b8d4a5a73 /OpenSim/Framework/Communications
parentFixed big bug in AgentAssetTransactions, now don't seem to be getting any Abo... (diff)
downloadopensim-SC_OLD-4c6e5a5090f847aa8944bd06168b45af8fcec3bf.zip
opensim-SC_OLD-4c6e5a5090f847aa8944bd06168b45af8fcec3bf.tar.gz
opensim-SC_OLD-4c6e5a5090f847aa8944bd06168b45af8fcec3bf.tar.bz2
opensim-SC_OLD-4c6e5a5090f847aa8944bd06168b45af8fcec3bf.tar.xz
* re-enabled AssetNotFound code
* turned script asset fetching asynchronous
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs31
1 files changed, 16 insertions, 15 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 0904823..dacb321 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -457,21 +457,22 @@ namespace OpenSim.Framework.Communications.Cache
457 457
458 public void AssetNotFound(LLUUID assetID) 458 public void AssetNotFound(LLUUID assetID)
459 { 459 {
460 m_log.ErrorFormat("[ASSET CACHE]: Unhandled AssetNotFound for {0}", assetID); 460 //m_log.ErrorFormat("[ASSET CACHE]: Unhandled AssetNotFound for {0}", assetID);
461 461
462 //if (this.RequestedTextures.ContainsKey(assetID)) 462 AssetRequest req;
463 //{ 463
464 // m_log.WarnFormat("[ASSET CACHE]: sending image not found for {0}", assetID); 464 if (RequestedTextures.TryGetValue(assetID, out req))
465 // AssetRequest req = this.RequestedTextures[assetID]; 465 {
466 // ImageNotInDatabasePacket notFound = new ImageNotInDatabasePacket(); 466 m_log.WarnFormat("[ASSET CACHE]: sending image not found for {0}", assetID);
467 // notFound.ImageID.ID = assetID; 467 ImageNotInDatabasePacket notFound = new ImageNotInDatabasePacket();
468 // req.RequestUser.OutPacket(notFound); 468 notFound.ImageID.ID = assetID;
469 // this.RequestedTextures.Remove(assetID); 469 req.RequestUser.OutPacket(notFound, ThrottleOutPacketType.Unknown);
470 //} 470 RequestedTextures.Remove(assetID);
471 //else 471 }
472 //{ 472 else
473 // m_log.ErrorFormat("[ASSET CACHE]: Cound not send image not found for {0}", assetID); 473 {
474 //} 474 m_log.ErrorFormat("[ASSET CACHE]: Asset [{0}] not found, but couldn't find any users to send to ", assetID);
475 }
475 } 476 }
476 477
477 private int CalculateNumPackets(byte[] data) 478 private int CalculateNumPackets(byte[] data)