aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2008-11-09 23:05:08 +0000
committerAdam Frisby2008-11-09 23:05:08 +0000
commite0498e1638e1d0aff7c571fc05bf4a5969a681bc (patch)
tree1571f625c9258216e7d4fedd16a881ab01f96184
parentPrevent updates about other people's HUD objects being sent (diff)
downloadopensim-SC_OLD-e0498e1638e1d0aff7c571fc05bf4a5969a681bc.zip
opensim-SC_OLD-e0498e1638e1d0aff7c571fc05bf4a5969a681bc.tar.gz
opensim-SC_OLD-e0498e1638e1d0aff7c571fc05bf4a5969a681bc.tar.bz2
opensim-SC_OLD-e0498e1638e1d0aff7c571fc05bf4a5969a681bc.tar.xz
* Fixed asset bug.
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 0581cc6..9ec5a98 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -484,7 +484,7 @@ namespace OpenSim.Framework.Communications.Cache
484 } 484 }
485 485
486 // It has an entry in our cache 486 // It has an entry in our cache
487 AssetInfo asset = (AssetInfo)m_memcache[requestID]; 487 AssetBase asset = (AssetBase)m_memcache[requestID];
488 488
489 // FIXME: We never tell the client about assets which do not exist when requested by this transfer mechanism, which can't be right. 489 // FIXME: We never tell the client about assets which do not exist when requested by this transfer mechanism, which can't be right.
490 if (null == asset) 490 if (null == asset)
@@ -504,7 +504,7 @@ namespace OpenSim.Framework.Communications.Cache
504 req.TransferRequestID = transferRequest.TransferInfo.TransferID; 504 req.TransferRequestID = transferRequest.TransferInfo.TransferID;
505 req.AssetRequestSource = source; 505 req.AssetRequestSource = source;
506 req.Params = transferRequest.TransferInfo.Params; 506 req.Params = transferRequest.TransferInfo.Params;
507 req.AssetInf = asset; 507 req.AssetInf = new AssetInfo(asset);
508 req.NumPackets = CalculateNumPackets(asset.Data); 508 req.NumPackets = CalculateNumPackets(asset.Data);
509 AssetRequests.Add(req); 509 AssetRequests.Add(req);
510 } 510 }