aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-08-26 20:34:14 +0000
committerMW2007-08-26 20:34:14 +0000
commitb9346844c1d56a74f405c6e518706c0e754297d8 (patch)
tree1dfb8fb4a3e05a104c867b5d99572131cd39e6df
parentAnother attempt to fix the image sending bug (next week, I intend to rewrite ... (diff)
downloadopensim-SC-b9346844c1d56a74f405c6e518706c0e754297d8.zip
opensim-SC-b9346844c1d56a74f405c6e518706c0e754297d8.tar.gz
opensim-SC-b9346844c1d56a74f405c6e518706c0e754297d8.tar.bz2
opensim-SC-b9346844c1d56a74f405c6e518706c0e754297d8.tar.xz
See if this fixes the 0x0 texture size problems, and speeds up texture downloads in general a little bit.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index c6de226..4f845b5 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -230,7 +230,7 @@ namespace OpenSim.Framework.Communications.Caches
230 UsersSent.Add(sender.request.ImageInfo.FullID, 1); 230 UsersSent.Add(sender.request.ImageInfo.FullID, 1);
231 231
232 } 232 }
233 if (TimesTextureSent[sender.request.RequestUser.AgentId][sender.request.ImageInfo.FullID] < 600) 233 if (TimesTextureSent[sender.request.RequestUser.AgentId][sender.request.ImageInfo.FullID] < 1000)
234 { 234 {
235 bool finished = sender.SendTexture(); 235 bool finished = sender.SendTexture();
236 if (finished) 236 if (finished)
@@ -336,6 +336,7 @@ namespace OpenSim.Framework.Communications.Caches
336 ImageNotInDatabasePacket notFound = new ImageNotInDatabasePacket(); 336 ImageNotInDatabasePacket notFound = new ImageNotInDatabasePacket();
337 notFound.ImageID.ID = assetID; 337 notFound.ImageID.ID = assetID;
338 req.RequestUser.OutPacket(notFound); 338 req.RequestUser.OutPacket(notFound);
339 //Console.WriteLine("sending image not found for " + assetID);
339 340
340 this.RequestedTextures.Remove(assetID); 341 this.RequestedTextures.Remove(assetID);
341 } 342 }
@@ -698,7 +699,7 @@ namespace OpenSim.Framework.Communications.Caches
698 SendPacket(); 699 SendPacket();
699 counter++; 700 counter++;
700 701
701 if ((request.PacketCounter > request.NumPackets) | (counter > 90) | (request.NumPackets == 1)) 702 if ((request.PacketCounter > request.NumPackets) | (counter > 100) | (request.NumPackets == 1))
702 { 703 {
703 return true; 704 return true;
704 } 705 }