aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMW2008-02-27 22:47:33 +0000
committerMW2008-02-27 22:47:33 +0000
commit70ad5604cddd24b896e843255325240116a4dc22 (patch)
treeee3c62ed4d293f15e1422e5162ee0dfa47e46ec6 /OpenSim/Region/Environment
parentsmall fix in the showstate data in AssetCache to reflect that now some functi... (diff)
downloadopensim-SC-70ad5604cddd24b896e843255325240116a4dc22.zip
opensim-SC-70ad5604cddd24b896e843255325240116a4dc22.tar.gz
opensim-SC-70ad5604cddd24b896e843255325240116a4dc22.tar.bz2
opensim-SC-70ad5604cddd24b896e843255325240116a4dc22.tar.xz
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.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/AssetDownloadModule.cs14
1 files changed, 7 insertions, 7 deletions
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
65 if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID)) 65 if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID))
66 { 66 {
67 RegisteredScenes.Add(scene.RegionInfo.RegionID, scene); 67 RegisteredScenes.Add(scene.RegionInfo.RegionID, scene);
68 scene.EventManager.OnNewClient += NewClient; 68 // scene.EventManager.OnNewClient += NewClient;
69 } 69 }
70 70
71 if (m_scene == null) 71 if (m_scene == null)
72 { 72 {
73 m_scene = scene; 73 m_scene = scene;
74 m_thread = new Thread(new ThreadStart(RunAssetQueue)); 74 // m_thread = new Thread(new ThreadStart(RunAssetQueue));
75 m_thread.Name = "AssetDownloadQueueThread"; 75 // m_thread.Name = "AssetDownloadQueueThread";
76 m_thread.IsBackground = true; 76 // m_thread.IsBackground = true;
77 m_thread.Start(); 77 // m_thread.Start();
78 OpenSim.Framework.ThreadTracker.Add(m_thread); 78 // OpenSim.Framework.ThreadTracker.Add(m_thread);
79 } 79 }
80 } 80 }
81 81
@@ -99,7 +99,7 @@ namespace OpenSim.Region.Environment.Modules
99 99
100 public void NewClient(IClientAPI client) 100 public void NewClient(IClientAPI client)
101 { 101 {
102 client.OnRequestAsset += AddAssetRequest; 102 // client.OnRequestAsset += AddAssetRequest;
103 } 103 }
104 104
105 /// <summary> 105 /// <summary>