disabled AssetDownloadModule and re-enabled the asset download code in the asset cache, until it can be seen if the module was the cause of some new problems that seem like they might be related to assets. I'll look into this more tomorrow.

2 files changed, 10 insertions, 10 deletions

diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 55c5726..aa7db95 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -3564,12 +3564,12 @@ namespace OpenSim.Region.ClientStack
                     case PacketType.TransferRequest:
                         //Console.WriteLine("ClientView.ProcessPackets.cs:ProcessInPacket() - Got transfer request");
                         TransferRequestPacket transfer = (TransferRequestPacket)Pack;
-                        // m_assetCache.AddAssetRequest(this, transfer);
-                        handler094 = OnRequestAsset;
+                        m_assetCache.AddAssetRequest(this, transfer);
+                       /* handler094 = OnRequestAsset;
                         if (handler094 != null)
                         {
                             handler094(this, transfer);
-                        }
+                        }*/
                         break;
                     case PacketType.AssetUploadRequest:
                         AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack;
diff --git a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
index ca01cae..f53be41 100644
--- a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
@@ -65,17 +65,17 @@ namespace OpenSim.Region.Environment.Modules
             if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID))
             {
                 RegisteredScenes.Add(scene.RegionInfo.RegionID, scene);
-                scene.EventManager.OnNewClient += NewClient;
+              //  scene.EventManager.OnNewClient += NewClient;
             }
 
             if (m_scene == null)
             {
                 m_scene = scene;
-                m_thread = new Thread(new ThreadStart(RunAssetQueue));
-                m_thread.Name = "AssetDownloadQueueThread";
-                m_thread.IsBackground = true;
-                m_thread.Start();
-                OpenSim.Framework.ThreadTracker.Add(m_thread);
+               // m_thread = new Thread(new ThreadStart(RunAssetQueue));
+              //  m_thread.Name = "AssetDownloadQueueThread";
+               // m_thread.IsBackground = true;
+               // m_thread.Start();
+               // OpenSim.Framework.ThreadTracker.Add(m_thread);
             }
         }
 
@@ -99,7 +99,7 @@ namespace OpenSim.Region.Environment.Modules
 
         public void NewClient(IClientAPI client)
         {
-            client.OnRequestAsset += AddAssetRequest;
+           // client.OnRequestAsset += AddAssetRequest;
         }
 
         /// <summary>