diff options
Revert "Updates all IRegionModules to the new style region modules."
This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs index 6bda1e9..285d36a 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs | |||
@@ -30,7 +30,6 @@ using System.Collections.Generic; | |||
30 | using System.Drawing; | 30 | using System.Drawing; |
31 | using System.Reflection; | 31 | using System.Reflection; |
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 OpenMetaverse.Imaging; | 35 | using OpenMetaverse.Imaging; |
@@ -60,8 +59,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
60 | public face[] trns; | 59 | public face[] trns; |
61 | } | 60 | } |
62 | 61 | ||
63 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 62 | public class MapImageModule : IMapImageGenerator, IRegionModule |
64 | public class MapImageModule : IMapImageGenerator, INonSharedRegionModule | ||
65 | { | 63 | { |
66 | private static readonly ILog m_log = | 64 | private static readonly ILog m_log = |
67 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 65 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
@@ -130,38 +128,25 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
130 | 128 | ||
131 | #endregion | 129 | #endregion |
132 | 130 | ||
133 | #region INonSharedRegionModule Members | 131 | #region IRegionModule Members |
134 | 132 | ||
135 | public void Initialise(IConfigSource source) | 133 | public void Initialise(Scene scene, IConfigSource source) |
136 | { | 134 | { |
135 | m_scene = scene; | ||
137 | m_config = source; | 136 | m_config = source; |
138 | 137 | ||
139 | IConfig startupConfig = m_config.Configs["Startup"]; | 138 | IConfig startupConfig = m_config.Configs["Startup"]; |
140 | if (startupConfig.GetString("MapImageModule", "MapImageModule") != | 139 | if (startupConfig.GetString("MapImageModule", "MapImageModule") != |
141 | "MapImageModule") | 140 | "MapImageModule") |
142 | return; | 141 | return; |
143 | } | ||
144 | 142 | ||
145 | public void AddRegion(Scene scene) | ||
146 | { | ||
147 | m_scene = scene; | ||
148 | m_scene.RegisterModuleInterface<IMapImageGenerator>(this); | 143 | m_scene.RegisterModuleInterface<IMapImageGenerator>(this); |
149 | } | 144 | } |
150 | 145 | ||
151 | public Type ReplaceableInterface | 146 | public void PostInitialise() |
152 | { | ||
153 | get { return null; } | ||
154 | } | ||
155 | |||
156 | public void RegionLoaded(Scene scene) | ||
157 | { | 147 | { |
158 | } | 148 | } |
159 | 149 | ||
160 | public void RemoveRegion(Scene scene) | ||
161 | { | ||
162 | scene.UnregisterModuleInterface<IMapImageGenerator>(this); | ||
163 | } | ||
164 | |||
165 | public void Close() | 150 | public void Close() |
166 | { | 151 | { |
167 | } | 152 | } |
@@ -171,6 +156,11 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
171 | get { return "MapImageModule"; } | 156 | get { return "MapImageModule"; } |
172 | } | 157 | } |
173 | 158 | ||
159 | public bool IsSharedModule | ||
160 | { | ||
161 | get { return false; } | ||
162 | } | ||
163 | |||
174 | #endregion | 164 | #endregion |
175 | 165 | ||
176 | // TODO: unused: | 166 | // TODO: unused: |