diff options
author | Melanie | 2010-01-29 07:20:13 +0000 |
---|---|---|
committer | Melanie | 2010-01-29 07:20:13 +0000 |
commit | cfca9e1e811f6cdea6b7c3338f7f783a07f8e0ac (patch) | |
tree | 43f3fd01f30651d482f81b5ae7c25fd84cc8ca37 /OpenSim/Region/CoreModules/Agent/TextureDownload | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC-cfca9e1e811f6cdea6b7c3338f7f783a07f8e0ac.zip opensim-SC-cfca9e1e811f6cdea6b7c3338f7f783a07f8e0ac.tar.gz opensim-SC-cfca9e1e811f6cdea6b7c3338f7f783a07f8e0ac.tar.bz2 opensim-SC-cfca9e1e811f6cdea6b7c3338f7f783a07f8e0ac.tar.xz |
Revert "Updates all IRegionModules to the new style region modules."
This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf.
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent/TextureDownload')
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs index c4d84cb..71ff28c 100644 --- a/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs | |||
@@ -30,7 +30,6 @@ using System.Collections.Generic; | |||
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using System.Threading; | 31 | using System.Threading; |
32 | using log4net; | 32 | using log4net; |
33 | using Mono.Addins; | ||
34 | using Nini.Config; | 33 | using Nini.Config; |
35 | using OpenMetaverse; | 34 | using OpenMetaverse; |
36 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
@@ -42,8 +41,7 @@ using OpenSim.Services.Interfaces; | |||
42 | 41 | ||
43 | namespace OpenSim.Region.CoreModules.Agent.TextureDownload | 42 | namespace OpenSim.Region.CoreModules.Agent.TextureDownload |
44 | { | 43 | { |
45 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 44 | public class TextureDownloadModule : IRegionModule |
46 | public class TextureDownloadModule : INonSharedRegionModule | ||
47 | { | 45 | { |
48 | private static readonly ILog m_log | 46 | private static readonly ILog m_log |
49 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
@@ -67,14 +65,11 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload | |||
67 | { | 65 | { |
68 | } | 66 | } |
69 | 67 | ||
70 | #region INonSharedRegionModule Members | 68 | #region IRegionModule Members |
71 | 69 | ||
72 | public void Initialise(IConfigSource config) | 70 | public void Initialise(Scene scene, IConfigSource config) |
73 | { | ||
74 | } | ||
75 | |||
76 | public void AddRegion(Scene scene) | ||
77 | { | 71 | { |
72 | |||
78 | if (m_scene == null) | 73 | if (m_scene == null) |
79 | { | 74 | { |
80 | //m_log.Debug("Creating Texture download module"); | 75 | //m_log.Debug("Creating Texture download module"); |
@@ -95,23 +90,10 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload | |||
95 | } | 90 | } |
96 | } | 91 | } |
97 | 92 | ||
98 | public Type ReplaceableInterface | 93 | public void PostInitialise() |
99 | { | ||
100 | get { return null; } | ||
101 | } | ||
102 | |||
103 | public void RegionLoaded(Scene scene) | ||
104 | { | 94 | { |
105 | } | 95 | } |
106 | 96 | ||
107 | public void RemoveRegion(Scene scene) | ||
108 | { | ||
109 | if(m_scenes.Contains(scene)) | ||
110 | m_scenes.Remove(scene); | ||
111 | scene.EventManager.OnNewClient -= NewClient; | ||
112 | scene.EventManager.OnRemovePresence -= EventManager_OnRemovePresence; | ||
113 | } | ||
114 | |||
115 | public void Close() | 97 | public void Close() |
116 | { | 98 | { |
117 | } | 99 | } |
@@ -121,6 +103,11 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload | |||
121 | get { return "TextureDownloadModule"; } | 103 | get { return "TextureDownloadModule"; } |
122 | } | 104 | } |
123 | 105 | ||
106 | public bool IsSharedModule | ||
107 | { | ||
108 | get { return false; } | ||
109 | } | ||
110 | |||
124 | #endregion | 111 | #endregion |
125 | 112 | ||
126 | /// <summary> | 113 | /// <summary> |