diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/AssetDownloadModule.cs | 14 |
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 | |||
3564 | case PacketType.TransferRequest: | 3564 | case PacketType.TransferRequest: |
3565 | //Console.WriteLine("ClientView.ProcessPackets.cs:ProcessInPacket() - Got transfer request"); | 3565 | //Console.WriteLine("ClientView.ProcessPackets.cs:ProcessInPacket() - Got transfer request"); |
3566 | TransferRequestPacket transfer = (TransferRequestPacket)Pack; | 3566 | TransferRequestPacket transfer = (TransferRequestPacket)Pack; |
3567 | // m_assetCache.AddAssetRequest(this, transfer); | 3567 | m_assetCache.AddAssetRequest(this, transfer); |
3568 | handler094 = OnRequestAsset; | 3568 | /* handler094 = OnRequestAsset; |
3569 | if (handler094 != null) | 3569 | if (handler094 != null) |
3570 | { | 3570 | { |
3571 | handler094(this, transfer); | 3571 | handler094(this, transfer); |
3572 | } | 3572 | }*/ |
3573 | break; | 3573 | break; |
3574 | case PacketType.AssetUploadRequest: | 3574 | case PacketType.AssetUploadRequest: |
3575 | AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack; | 3575 | 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 | |||
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> |