diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 54d3c61..57ab135 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -31,6 +31,7 @@ using System.IO; | |||
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using System.Security; | 32 | using System.Security; |
33 | using log4net; | 33 | using log4net; |
34 | using Mono.Addins; | ||
34 | using Nini.Config; | 35 | using Nini.Config; |
35 | using OpenMetaverse; | 36 | using OpenMetaverse; |
36 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
@@ -39,15 +40,17 @@ using OpenSim.Region.Framework.Scenes; | |||
39 | 40 | ||
40 | namespace OpenSim.Region.CoreModules.World.Estate | 41 | namespace OpenSim.Region.CoreModules.World.Estate |
41 | { | 42 | { |
42 | public class EstateManagementModule : IEstateModule | 43 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "EstateManagementModule")] |
44 | public class EstateManagementModule : IEstateModule, INonSharedRegionModule | ||
43 | { | 45 | { |
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 47 | ||
46 | private delegate void LookupUUIDS(List<UUID> uuidLst); | 48 | private delegate void LookupUUIDS(List<UUID> uuidLst); |
47 | 49 | ||
48 | public Scene Scene { get; private set; } | 50 | public Scene Scene { get; private set; } |
51 | public IUserManagement UserManager { get; private set; } | ||
49 | 52 | ||
50 | protected EstateManagementCommands m_commands; | 53 | protected EstateManagementCommands m_commands; |
51 | 54 | ||
52 | private EstateTerrainXferHandler TerrainUploader; | 55 | private EstateTerrainXferHandler TerrainUploader; |
53 | 56 | ||
@@ -895,9 +898,15 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
895 | #endregion | 898 | #endregion |
896 | 899 | ||
897 | #region IRegionModule Members | 900 | #region IRegionModule Members |
901 | |||
902 | public string Name { get { return "EstateManagementModule"; } } | ||
903 | |||
904 | public Type ReplaceableInterface { get { return null; } } | ||
898 | 905 | ||
899 | public void Initialise(Scene scene, IConfigSource source) | 906 | public void Initialise(IConfigSource source) {} |
900 | { | 907 | |
908 | public void AddRegion(Scene scene) | ||
909 | { | ||
901 | Scene = scene; | 910 | Scene = scene; |
902 | Scene.RegisterModuleInterface<IEstateModule>(this); | 911 | Scene.RegisterModuleInterface<IEstateModule>(this); |
903 | Scene.EventManager.OnNewClient += EventManager_OnNewClient; | 912 | Scene.EventManager.OnNewClient += EventManager_OnNewClient; |
@@ -906,26 +915,21 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
906 | m_commands = new EstateManagementCommands(this); | 915 | m_commands = new EstateManagementCommands(this); |
907 | m_commands.Initialise(); | 916 | m_commands.Initialise(); |
908 | } | 917 | } |
909 | 918 | ||
910 | public void PostInitialise() | 919 | public void RemoveRegion(Scene scene) {} |
920 | |||
921 | public void RegionLoaded(Scene scene) | ||
911 | { | 922 | { |
912 | // Sets up the sun module based no the saved Estate and Region Settings | 923 | // Sets up the sun module based no the saved Estate and Region Settings |
913 | // DO NOT REMOVE or the sun will stop working | 924 | // DO NOT REMOVE or the sun will stop working |
914 | Scene.TriggerEstateSunUpdate(); | 925 | scene.TriggerEstateSunUpdate(); |
915 | } | 926 | |
916 | 927 | UserManager = scene.RequestModuleInterface<IUserManagement>(); | |
917 | public void Close() | ||
918 | { | ||
919 | } | ||
920 | |||
921 | public string Name | ||
922 | { | ||
923 | get { return "EstateManagementModule"; } | ||
924 | } | 928 | } |
925 | 929 | ||
926 | public bool IsSharedModule | 930 | public void Close() |
927 | { | 931 | { |
928 | get { return false; } | 932 | m_commands.Close(); |
929 | } | 933 | } |
930 | 934 | ||
931 | #endregion | 935 | #endregion |