diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | 35 |
1 files changed, 8 insertions, 27 deletions
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) |