From a56a17fab20e1ef94e70dbf6648ebb2f437de364 Mon Sep 17 00:00:00 2001
From: MW
Date: Thu, 9 Aug 2007 12:59:42 +0000
Subject: Making sure my local working copy is in sync with svn before I start
 the job of enabling the new SceneObject classes.

---
 OpenSim/Framework/Communications/Cache/AssetCache.cs  | 8 +++++---
 OpenSim/Framework/Communications/Capabilities/Caps.cs | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Framework/Communications')

diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index acdd593..3866e21 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -224,7 +224,7 @@ namespace OpenSim.Framework.Communications.Caches
                 lock (this.SendingTextures)
                 {
                     this.SendingTextures.Remove(sender.request.ImageInfo.FullID);
-                    this.AvatarRecievedTextures[sender.request.RequestUser.AgentId].Add(sender.request.ImageInfo.FullID);
+                   // this.AvatarRecievedTextures[sender.request.RequestUser.AgentId].Add(sender.request.ImageInfo.FullID);
                 }
             }
         }
@@ -634,7 +634,8 @@ namespace OpenSim.Framework.Communications.Caches
         public class TextureSender
         {
             public AssetRequest request;
-          
+            private int counter = 0;
+
             public TextureSender(AssetRequest req)
             {
                 request = req;
@@ -644,8 +645,9 @@ namespace OpenSim.Framework.Communications.Caches
             public bool SendTexture()
             {
                 SendPacket();
+                counter++;
               
-                if ((request.PacketCounter > request.NumPackets) |(request.NumPackets ==1))
+                if ((request.PacketCounter > request.NumPackets) | (counter >120) |(request.NumPackets ==1))
                 {
                     return true;
                 }
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 82ef08d..d56cf6f 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -304,7 +304,7 @@ namespace OpenSim.Region.Capabilities
             private LLUUID newAssetID;
             private LLUUID inventoryItemID;
             private BaseHttpServer httpListener;
-            private bool SaveAssets = false;
+            private bool SaveAssets = true;
             private string m_assetName = "";
 
             /// <summary>
-- 
cgit v1.1