diff options
author | Adam Frisby | 2008-05-01 18:04:42 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-01 18:04:42 +0000 |
commit | 20a9bf08f51351e1e0a9de94f184ff56cd572665 (patch) | |
tree | 52da64dab26353b903c8e4befed0178fa72a188b /OpenSim/Region/Environment/Modules/Agent/TextureDownload | |
parent | More config cleanup in LaunchSLClient. (diff) | |
download | opensim-SC_OLD-20a9bf08f51351e1e0a9de94f184ff56cd572665.zip opensim-SC_OLD-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.gz opensim-SC_OLD-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.bz2 opensim-SC_OLD-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.xz |
* Rolled back a few changes.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Agent/TextureDownload')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs index 96ef61f..474ac75 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs | |||
@@ -47,8 +47,6 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
47 | private readonly BlockingQueue<ITextureSender> m_queueSenders | 47 | private readonly BlockingQueue<ITextureSender> m_queueSenders |
48 | = new BlockingQueue<ITextureSender>(); | 48 | = new BlockingQueue<ITextureSender>(); |
49 | 49 | ||
50 | private readonly List<Scene> m_scenes = new List<Scene>(); | ||
51 | |||
52 | /// <summary> | 50 | /// <summary> |
53 | /// Each user has their own texture download service. | 51 | /// Each user has their own texture download service. |
54 | /// </summary> | 52 | /// </summary> |
@@ -56,9 +54,14 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
56 | new Dictionary<LLUUID, UserTextureDownloadService>(); | 54 | new Dictionary<LLUUID, UserTextureDownloadService>(); |
57 | 55 | ||
58 | private Scene m_scene; | 56 | private Scene m_scene; |
57 | private List<Scene> m_scenes = new List<Scene>(); | ||
59 | 58 | ||
60 | private Thread m_thread; | 59 | private Thread m_thread; |
61 | 60 | ||
61 | public TextureDownloadModule() | ||
62 | { | ||
63 | } | ||
64 | |||
62 | #region IRegionModule Members | 65 | #region IRegionModule Members |
63 | 66 | ||
64 | public void Initialise(Scene scene, IConfigSource config) | 67 | public void Initialise(Scene scene, IConfigSource config) |
@@ -66,7 +69,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
66 | if (m_scene == null) | 69 | if (m_scene == null) |
67 | { | 70 | { |
68 | //Console.WriteLine("Creating Texture download module"); | 71 | //Console.WriteLine("Creating Texture download module"); |
69 | m_thread = new Thread(ProcessTextureSenders); | 72 | m_thread = new Thread(new ThreadStart(ProcessTextureSenders)); |
70 | m_thread.Name = "ProcessTextureSenderThread"; | 73 | m_thread.Name = "ProcessTextureSenderThread"; |
71 | m_thread.IsBackground = true; | 74 | m_thread.IsBackground = true; |
72 | m_thread.Start(); | 75 | m_thread.Start(); |
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs index 7d4c919..70e44d4 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs | |||
@@ -40,13 +40,13 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
40 | //private static readonly log4net.ILog m_log | 40 | //private static readonly log4net.ILog m_log |
41 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 41 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
42 | 42 | ||
43 | private readonly LLUUID m_textureId; | 43 | private bool m_cancel = false; |
44 | private bool m_cancel; | ||
45 | private IClientAPI m_client; | 44 | private IClientAPI m_client; |
46 | 45 | ||
47 | // See ITextureSender | 46 | // See ITextureSender |
48 | 47 | ||
49 | private bool m_sending; | 48 | private bool m_sending = false; |
49 | private LLUUID m_textureId; | ||
50 | 50 | ||
51 | // See ITextureSender | 51 | // See ITextureSender |
52 | 52 | ||