diff options
author | Justin Clark-Casey (justincc) | 2012-11-14 02:30:12 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-11-14 02:30:12 +0000 |
commit | 564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c (patch) | |
tree | 1d046904229e0a6c36481c255ceb71eda7c72872 /OpenSim/Region/CoreModules/World/WorldMap | |
parent | Stop Prebuild from generating <copy> statements which unnecessarily copy file... (diff) | |
parent | Deleted OptionalModules.addin.xml. Added AssemblyInfo.cs for that dll. (diff) | |
download | opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.zip opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.tar.gz opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.tar.bz2 opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs index 8f1a35d..46b190e 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | |||
@@ -30,6 +30,7 @@ using System.Reflection; | |||
30 | using log4net; | 30 | using log4net; |
31 | using Nini.Config; | 31 | using Nini.Config; |
32 | using OpenMetaverse; | 32 | using OpenMetaverse; |
33 | using Mono.Addins; | ||
33 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
34 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
35 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
@@ -38,6 +39,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion; | |||
38 | 39 | ||
39 | namespace OpenSim.Region.CoreModules.World.WorldMap | 40 | namespace OpenSim.Region.CoreModules.World.WorldMap |
40 | { | 41 | { |
42 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MapSearchModule")] | ||
41 | public class MapSearchModule : ISharedRegionModule | 43 | public class MapSearchModule : ISharedRegionModule |
42 | { | 44 | { |
43 | private static readonly ILog m_log = | 45 | private static readonly ILog m_log = |
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index dfba3ff..e2f525c 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -40,6 +40,7 @@ using Nini.Config; | |||
40 | using OpenMetaverse; | 40 | using OpenMetaverse; |
41 | using OpenMetaverse.Imaging; | 41 | using OpenMetaverse.Imaging; |
42 | using OpenMetaverse.StructuredData; | 42 | using OpenMetaverse.StructuredData; |
43 | using Mono.Addins; | ||
43 | using OpenSim.Framework; | 44 | using OpenSim.Framework; |
44 | using OpenSim.Framework.Capabilities; | 45 | using OpenSim.Framework.Capabilities; |
45 | using OpenSim.Framework.Monitoring; | 46 | using OpenSim.Framework.Monitoring; |
@@ -55,6 +56,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion; | |||
55 | 56 | ||
56 | namespace OpenSim.Region.CoreModules.World.WorldMap | 57 | namespace OpenSim.Region.CoreModules.World.WorldMap |
57 | { | 58 | { |
59 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "WorldMapModule")] | ||
58 | public class WorldMapModule : INonSharedRegionModule, IWorldMapModule | 60 | public class WorldMapModule : INonSharedRegionModule, IWorldMapModule |
59 | { | 61 | { |
60 | private static readonly ILog m_log = | 62 | private static readonly ILog m_log = |