aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
diff options
context:
space:
mode:
authorMW2007-08-26 17:57:25 +0000
committerMW2007-08-26 17:57:25 +0000
commit291eb48fb0338d80e3baeed65664d7a72fea1892 (patch)
tree8fa18a9474cb998a2e20fa9a124979b01bd41a8f /OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
parentDanxors patch for >30prims with ODE (diff)
downloadopensim-SC_OLD-291eb48fb0338d80e3baeed65664d7a72fea1892.zip
opensim-SC_OLD-291eb48fb0338d80e3baeed65664d7a72fea1892.tar.gz
opensim-SC_OLD-291eb48fb0338d80e3baeed65664d7a72fea1892.tar.bz2
opensim-SC_OLD-291eb48fb0338d80e3baeed65664d7a72fea1892.tar.xz
Another attempt to fix the image sending bug (next week, I intend to rewrite the assetcache and asset server).
Attempt to fix bug # 326. (crashing when using save-xml and hollow prims) Attempt to fix bug # 328 (limit of 50 items in a folder)
Diffstat (limited to 'OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 0163528..ade7a0d 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -351,7 +351,7 @@ namespace OpenSim.Region.ClientStack
351 #region Inventory/Asset/Other related packets 351 #region Inventory/Asset/Other related packets
352 case PacketType.RequestImage: 352 case PacketType.RequestImage:
353 RequestImagePacket imageRequest = (RequestImagePacket)Pack; 353 RequestImagePacket imageRequest = (RequestImagePacket)Pack;
354 354 //Console.WriteLine("image request: " + Pack.ToString());
355 for (int i = 0; i < imageRequest.RequestImage.Length; i++) 355 for (int i = 0; i < imageRequest.RequestImage.Length; i++)
356 { 356 {
357 m_assetCache.AddTextureRequest(this, imageRequest.RequestImage[i].Image, imageRequest.RequestImage[i].Packet); 357 m_assetCache.AddTextureRequest(this, imageRequest.RequestImage[i].Image, imageRequest.RequestImage[i].Packet);
@@ -363,10 +363,11 @@ namespace OpenSim.Region.ClientStack
363 m_assetCache.AddAssetRequest(this, transfer); 363 m_assetCache.AddAssetRequest(this, transfer);
364 break; 364 break;
365 case PacketType.AssetUploadRequest: 365 case PacketType.AssetUploadRequest:
366 //Console.WriteLine("upload request " + Pack.ToString());
366 AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack; 367 AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack;
367 if (OnAssetUploadRequest != null) 368 if (OnAssetUploadRequest != null)
368 { 369 {
369 OnAssetUploadRequest(this, request.AssetBlock.TransactionID.Combine(this.SecureSessionID), request.AssetBlock.TransactionID, request.AssetBlock.Type, request.AssetBlock.AssetData); 370 OnAssetUploadRequest(this, request.AssetBlock.TransactionID.Combine(this.SecureSessionID), request.AssetBlock.TransactionID, request.AssetBlock.Type, request.AssetBlock.AssetData, request.AssetBlock.StoreLocal);
370 } 371 }
371 break; 372 break;
372 case PacketType.RequestXfer: 373 case PacketType.RequestXfer: