From d3ff4e080637cb76e60713954aa84161d28ef750 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 13 Jan 2018 14:40:31 +0000 Subject: [PATCH] clean some modules api --- OpenSim/Data/MySQL/Resources/XMute.migrations | 16 ---------------- .../LocalUserProfilesServiceConnector.cs | 12 ++++++------ .../World/AutoBackup/AutoBackupModule.cs | 16 ++++++++-------- 3 files changed, 14 insertions(+), 30 deletions(-) delete mode 100644 OpenSim/Data/MySQL/Resources/XMute.migrations diff --git a/OpenSim/Data/MySQL/Resources/XMute.migrations b/OpenSim/Data/MySQL/Resources/XMute.migrations deleted file mode 100644 index 4ac7f82448..0000000000 --- a/OpenSim/Data/MySQL/Resources/XMute.migrations +++ /dev/null @@ -1,16 +0,0 @@ -:VERSION 1 - -BEGIN; - -CREATE TABLE `XMute` ( - `AgentID` char(36) NOT NULL, - `MuteID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000', - `MuteName` varchar(64) NOT NULL DEFAULT '', - `MuteType` int(11) NOT NULL DEFAULT '1', - `MuteFlags` int(11) NOT NULL DEFAULT '0', - `Stamp` int(11) NOT NULL, - UNIQUE KEY `AgentID_2` (`AgentID`,`MuteID`,`MuteName`), - KEY `AgentID` (`AgentID`) -); - -COMMIT; diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs index 2e6f472399..e6da6c3c31 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs @@ -163,7 +163,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile #region ISharedRegionModule implementation - void ISharedRegionModule.PostInitialise() + public void PostInitialise() { if(!Enabled) return; @@ -173,7 +173,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile #region IRegionModuleBase implementation - void IRegionModuleBase.Initialise(IConfigSource source) + public void Initialise(IConfigSource source) { IConfig moduleConfig = source.Configs["Modules"]; if (moduleConfig != null) @@ -187,12 +187,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile } } - void IRegionModuleBase.Close() + public void Close() { return; } - void IRegionModuleBase.AddRegion(Scene scene) + public void AddRegion(Scene scene) { if (!Enabled) return; @@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile } } - void IRegionModuleBase.RemoveRegion(Scene scene) + public void RemoveRegion(Scene scene) { if (!Enabled) return; @@ -218,7 +218,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile } } - void IRegionModuleBase.RegionLoaded(Scene scene) + public void RegionLoaded(Scene scene) { if (!Enabled) return; diff --git a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs index a14d8194ad..64513a0f0c 100644 --- a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs +++ b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs @@ -127,7 +127,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup /// /// Identifies the module to the system. /// - string IRegionModuleBase.Name + public string Name { get { return "AutoBackupModule"; } } @@ -135,7 +135,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup /// /// We don't implement an interface, this is a single-use module. /// - Type IRegionModuleBase.ReplaceableInterface + public Type ReplaceableInterface { get { return null; } } @@ -144,7 +144,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup /// Called once in the lifetime of the module at startup. /// /// The input config source for OpenSim.ini. - void IRegionModuleBase.Initialise(IConfigSource source) + public void Initialise(IConfigSource source) { // Determine if we have been enabled at all in OpenSim.ini -- this is part and parcel of being an optional module m_configSource = source; @@ -184,7 +184,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup /// /// Called once at de-init (sim shutting down). /// - void IRegionModuleBase.Close() + public void Close() { if (!m_enabled) return; @@ -197,7 +197,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup /// Currently a no-op for AutoBackup because we have to wait for region to be fully loaded. /// /// - void IRegionModuleBase.AddRegion (Scene scene) + public void AddRegion (Scene scene) { if (!m_enabled) return; @@ -210,7 +210,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup /// Here we just clean up some resources and stop the OAR backup (if any) for the given scene. /// /// The scene (region) to stop performing AutoBackup on. - void IRegionModuleBase.RemoveRegion(Scene scene) + public void RemoveRegion(Scene scene) { if (m_enabled) return; @@ -228,7 +228,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup /// We read lots of Nini config, maybe set a timer, add members to state tracking Dictionaries, etc. /// /// The scene to (possibly) perform AutoBackup on. - void IRegionModuleBase.RegionLoaded(Scene scene) + public void RegionLoaded(Scene scene) { if (!m_enabled) return; @@ -258,7 +258,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup /// /// Currently a no-op. /// - void ISharedRegionModule.PostInitialise() + public void PostInitialise() { }