aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMW2007-08-27 10:34:28 +0000
committerMW2007-08-27 10:34:28 +0000
commit4c3be4e91f25d9d89b5adadd1eea3cf0b0d5cfec (patch)
tree6b52cb7da598ce859a0ed1dc72a77ba31fda1354 /OpenSim/Framework
parentHere is your ocean back. You will probably need to delete your regionassets.y... (diff)
downloadopensim-SC-4c3be4e91f25d9d89b5adadd1eea3cf0b0d5cfec.zip
opensim-SC-4c3be4e91f25d9d89b5adadd1eea3cf0b0d5cfec.tar.gz
opensim-SC-4c3be4e91f25d9d89b5adadd1eea3cf0b0d5cfec.tar.bz2
opensim-SC-4c3be4e91f25d9d89b5adadd1eea3cf0b0d5cfec.tar.xz
Another small tweak to image sending.
Implemented a few ll Functions, llSetObjectName llGetObjectName, llLoadURL (all currently untested).
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index d06582e..322cd6a 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] < 1000) 233 if (TimesTextureSent[sender.request.RequestUser.AgentId][sender.request.ImageInfo.FullID] < 1200)
234 { 234 {
235 bool finished = sender.SendTexture(); 235 bool finished = sender.SendTexture();
236 if (finished) 236 if (finished)
@@ -699,6 +699,7 @@ namespace OpenSim.Framework.Communications.Caches
699 { 699 {
700 SendPacket(); 700 SendPacket();
701 counter++; 701 counter++;
702
702 if ((request.PacketCounter >= request.NumPackets) | counter > 100 | (request.NumPackets == 1)) 703 if ((request.PacketCounter >= request.NumPackets) | counter > 100 | (request.NumPackets == 1))
703 { 704 {
704 return true; 705 return true;