diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs | 30 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | 35 |
2 files changed, 18 insertions, 47 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: |
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs index dd33673..be46fa5 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | |||
@@ -24,12 +24,9 @@ | |||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | |||
28 | using System; | ||
29 | using System.Collections.Generic; | 27 | using System.Collections.Generic; |
30 | using System.Reflection; | 28 | using System.Reflection; |
31 | using log4net; | 29 | using log4net; |
32 | using Mono.Addins; | ||
33 | using Nini.Config; | 30 | using Nini.Config; |
34 | using OpenMetaverse; | 31 | using OpenMetaverse; |
35 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
@@ -41,8 +38,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion; | |||
41 | 38 | ||
42 | namespace OpenSim.Region.CoreModules.World.WorldMap | 39 | namespace OpenSim.Region.CoreModules.World.WorldMap |
43 | { | 40 | { |
44 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 41 | public class MapSearchModule : IRegionModule |
45 | public class MapSearchModule : ISharedRegionModule | ||
46 | { | 42 | { |
47 | private static readonly ILog m_log = | 43 | private static readonly ILog m_log = |
48 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
@@ -50,12 +46,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
50 | Scene m_scene = null; // only need one for communication with GridService | 46 | Scene m_scene = null; // only need one for communication with GridService |
51 | List<Scene> m_scenes = new List<Scene>(); | 47 | List<Scene> m_scenes = new List<Scene>(); |
52 | 48 | ||
53 | #region ISharedRegionModule Members | 49 | #region IRegionModule Members |
54 | public void Initialise(IConfigSource source) | 50 | public void Initialise(Scene scene, IConfigSource source) |
55 | { | ||
56 | } | ||
57 | |||
58 | public void AddRegion(Scene scene) | ||
59 | { | 51 | { |
60 | if (m_scene == null) | 52 | if (m_scene == null) |
61 | { | 53 | { |
@@ -66,22 +58,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
66 | scene.EventManager.OnNewClient += OnNewClient; | 58 | scene.EventManager.OnNewClient += OnNewClient; |
67 | } | 59 | } |
68 | 60 | ||
69 | public Type ReplaceableInterface | ||
70 | { | ||
71 | get { return null; } | ||
72 | } | ||
73 | |||
74 | public void RegionLoaded(Scene scene) | ||
75 | { | ||
76 | } | ||
77 | |||
78 | public void RemoveRegion(Scene scene) | ||
79 | { | ||
80 | if(m_scenes.Contains(scene)) | ||
81 | m_scenes.Remove(scene); | ||
82 | scene.EventManager.OnNewClient -= OnNewClient; | ||
83 | } | ||
84 | |||
85 | public void PostInitialise() | 61 | public void PostInitialise() |
86 | { | 62 | { |
87 | } | 63 | } |
@@ -97,6 +73,11 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
97 | get { return "MapSearchModule"; } | 73 | get { return "MapSearchModule"; } |
98 | } | 74 | } |
99 | 75 | ||
76 | public bool IsSharedModule | ||
77 | { | ||
78 | get { return true; } | ||
79 | } | ||
80 | |||
100 | #endregion | 81 | #endregion |
101 | 82 | ||
102 | private void OnNewClient(IClientAPI client) | 83 | private void OnNewClient(IClientAPI client) |