diff options
author | Adam Frisby | 2008-05-01 16:35:00 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-01 16:35:00 +0000 |
commit | 13526097f24b7a8ad63b1d482c44b44397fa055f (patch) | |
tree | 7a82c20ed7c63e2aea5ad3863325e37f64e1cbea /OpenSim/Region/Environment/Modules/Agent/TextureDownload | |
parent | * Breaking all the code, breaking all the code..! (diff) | |
download | opensim-SC_OLD-13526097f24b7a8ad63b1d482c44b44397fa055f.zip opensim-SC_OLD-13526097f24b7a8ad63b1d482c44b44397fa055f.tar.gz opensim-SC_OLD-13526097f24b7a8ad63b1d482c44b44397fa055f.tar.bz2 opensim-SC_OLD-13526097f24b7a8ad63b1d482c44b44397fa055f.tar.xz |
* Spring cleaning on Region.Environment.
* Converted a large number of read-only fields to be actually, readonly.
* Reformatted code sections.
* Removed redundant code.
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, 6 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs index 474ac75..96ef61f 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs | |||
@@ -47,6 +47,8 @@ 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 | |||
50 | /// <summary> | 52 | /// <summary> |
51 | /// Each user has their own texture download service. | 53 | /// Each user has their own texture download service. |
52 | /// </summary> | 54 | /// </summary> |
@@ -54,14 +56,9 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
54 | new Dictionary<LLUUID, UserTextureDownloadService>(); | 56 | new Dictionary<LLUUID, UserTextureDownloadService>(); |
55 | 57 | ||
56 | private Scene m_scene; | 58 | private Scene m_scene; |
57 | private List<Scene> m_scenes = new List<Scene>(); | ||
58 | 59 | ||
59 | private Thread m_thread; | 60 | private Thread m_thread; |
60 | 61 | ||
61 | public TextureDownloadModule() | ||
62 | { | ||
63 | } | ||
64 | |||
65 | #region IRegionModule Members | 62 | #region IRegionModule Members |
66 | 63 | ||
67 | public void Initialise(Scene scene, IConfigSource config) | 64 | public void Initialise(Scene scene, IConfigSource config) |
@@ -69,7 +66,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
69 | if (m_scene == null) | 66 | if (m_scene == null) |
70 | { | 67 | { |
71 | //Console.WriteLine("Creating Texture download module"); | 68 | //Console.WriteLine("Creating Texture download module"); |
72 | m_thread = new Thread(new ThreadStart(ProcessTextureSenders)); | 69 | m_thread = new Thread(ProcessTextureSenders); |
73 | m_thread.Name = "ProcessTextureSenderThread"; | 70 | m_thread.Name = "ProcessTextureSenderThread"; |
74 | m_thread.IsBackground = true; | 71 | m_thread.IsBackground = true; |
75 | m_thread.Start(); | 72 | m_thread.Start(); |
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs index 70e44d4..7d4c919 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 bool m_cancel = false; | 43 | private readonly LLUUID m_textureId; |
44 | private bool m_cancel; | ||
44 | private IClientAPI m_client; | 45 | private IClientAPI m_client; |
45 | 46 | ||
46 | // See ITextureSender | 47 | // See ITextureSender |
47 | 48 | ||
48 | private bool m_sending = false; | 49 | private bool m_sending; |
49 | private LLUUID m_textureId; | ||
50 | 50 | ||
51 | // See ITextureSender | 51 | // See ITextureSender |
52 | 52 | ||