aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2018-01-13 14:40:31 +0000
committerUbitUmarov2018-01-13 14:40:31 +0000
commitd3ff4e080637cb76e60713954aa84161d28ef750 (patch)
treee283f78d54d5e95dfbc0c2e8c55114f847d9d95d
parentremove unused dll - XMLRPC is used not this (diff)
downloadopensim-SC-d3ff4e080637cb76e60713954aa84161d28ef750.zip
opensim-SC-d3ff4e080637cb76e60713954aa84161d28ef750.tar.gz
opensim-SC-d3ff4e080637cb76e60713954aa84161d28ef750.tar.bz2
opensim-SC-d3ff4e080637cb76e60713954aa84161d28ef750.tar.xz
clean some modules api
-rw-r--r--OpenSim/Data/MySQL/Resources/XMute.migrations16
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs12
-rw-r--r--OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs16
3 files changed, 14 insertions, 30 deletions
diff --git a/OpenSim/Data/MySQL/Resources/XMute.migrations b/OpenSim/Data/MySQL/Resources/XMute.migrations
deleted file mode 100644
index 4ac7f82..0000000
--- a/OpenSim/Data/MySQL/Resources/XMute.migrations
+++ /dev/null
@@ -1,16 +0,0 @@
1:VERSION 1
2
3BEGIN;
4
5CREATE TABLE `XMute` (
6 `AgentID` char(36) NOT NULL,
7 `MuteID` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
8 `MuteName` varchar(64) NOT NULL DEFAULT '',
9 `MuteType` int(11) NOT NULL DEFAULT '1',
10 `MuteFlags` int(11) NOT NULL DEFAULT '0',
11 `Stamp` int(11) NOT NULL,
12 UNIQUE KEY `AgentID_2` (`AgentID`,`MuteID`,`MuteName`),
13 KEY `AgentID` (`AgentID`)
14);
15
16COMMIT;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs
index 2e6f472..e6da6c3 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
163 163
164 #region ISharedRegionModule implementation 164 #region ISharedRegionModule implementation
165 165
166 void ISharedRegionModule.PostInitialise() 166 public void PostInitialise()
167 { 167 {
168 if(!Enabled) 168 if(!Enabled)
169 return; 169 return;
@@ -173,7 +173,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
173 173
174 #region IRegionModuleBase implementation 174 #region IRegionModuleBase implementation
175 175
176 void IRegionModuleBase.Initialise(IConfigSource source) 176 public void Initialise(IConfigSource source)
177 { 177 {
178 IConfig moduleConfig = source.Configs["Modules"]; 178 IConfig moduleConfig = source.Configs["Modules"];
179 if (moduleConfig != null) 179 if (moduleConfig != null)
@@ -187,12 +187,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
187 } 187 }
188 } 188 }
189 189
190 void IRegionModuleBase.Close() 190 public void Close()
191 { 191 {
192 return; 192 return;
193 } 193 }
194 194
195 void IRegionModuleBase.AddRegion(Scene scene) 195 public void AddRegion(Scene scene)
196 { 196 {
197 if (!Enabled) 197 if (!Enabled)
198 return; 198 return;
@@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
206 } 206 }
207 } 207 }
208 208
209 void IRegionModuleBase.RemoveRegion(Scene scene) 209 public void RemoveRegion(Scene scene)
210 { 210 {
211 if (!Enabled) 211 if (!Enabled)
212 return; 212 return;
@@ -218,7 +218,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
218 } 218 }
219 } 219 }
220 220
221 void IRegionModuleBase.RegionLoaded(Scene scene) 221 public void RegionLoaded(Scene scene)
222 { 222 {
223 if (!Enabled) 223 if (!Enabled)
224 return; 224 return;
diff --git a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs
index a14d819..64513a0 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
127 /// <summary> 127 /// <summary>
128 /// Identifies the module to the system. 128 /// Identifies the module to the system.
129 /// </summary> 129 /// </summary>
130 string IRegionModuleBase.Name 130 public string Name
131 { 131 {
132 get { return "AutoBackupModule"; } 132 get { return "AutoBackupModule"; }
133 } 133 }
@@ -135,7 +135,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
135 /// <summary> 135 /// <summary>
136 /// We don't implement an interface, this is a single-use module. 136 /// We don't implement an interface, this is a single-use module.
137 /// </summary> 137 /// </summary>
138 Type IRegionModuleBase.ReplaceableInterface 138 public Type ReplaceableInterface
139 { 139 {
140 get { return null; } 140 get { return null; }
141 } 141 }
@@ -144,7 +144,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
144 /// Called once in the lifetime of the module at startup. 144 /// Called once in the lifetime of the module at startup.
145 /// </summary> 145 /// </summary>
146 /// <param name="source">The input config source for OpenSim.ini.</param> 146 /// <param name="source">The input config source for OpenSim.ini.</param>
147 void IRegionModuleBase.Initialise(IConfigSource source) 147 public void Initialise(IConfigSource source)
148 { 148 {
149 // Determine if we have been enabled at all in OpenSim.ini -- this is part and parcel of being an optional module 149 // Determine if we have been enabled at all in OpenSim.ini -- this is part and parcel of being an optional module
150 m_configSource = source; 150 m_configSource = source;
@@ -184,7 +184,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
184 /// <summary> 184 /// <summary>
185 /// Called once at de-init (sim shutting down). 185 /// Called once at de-init (sim shutting down).
186 /// </summary> 186 /// </summary>
187 void IRegionModuleBase.Close() 187 public void Close()
188 { 188 {
189 if (!m_enabled) 189 if (!m_enabled)
190 return; 190 return;
@@ -197,7 +197,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
197 /// Currently a no-op for AutoBackup because we have to wait for region to be fully loaded. 197 /// Currently a no-op for AutoBackup because we have to wait for region to be fully loaded.
198 /// </summary> 198 /// </summary>
199 /// <param name="scene"></param> 199 /// <param name="scene"></param>
200 void IRegionModuleBase.AddRegion (Scene scene) 200 public void AddRegion (Scene scene)
201 { 201 {
202 if (!m_enabled) 202 if (!m_enabled)
203 return; 203 return;
@@ -210,7 +210,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
210 /// Here we just clean up some resources and stop the OAR backup (if any) for the given scene. 210 /// Here we just clean up some resources and stop the OAR backup (if any) for the given scene.
211 /// </summary> 211 /// </summary>
212 /// <param name="scene">The scene (region) to stop performing AutoBackup on.</param> 212 /// <param name="scene">The scene (region) to stop performing AutoBackup on.</param>
213 void IRegionModuleBase.RemoveRegion(Scene scene) 213 public void RemoveRegion(Scene scene)
214 { 214 {
215 if (m_enabled) 215 if (m_enabled)
216 return; 216 return;
@@ -228,7 +228,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
228 /// We read lots of Nini config, maybe set a timer, add members to state tracking Dictionaries, etc. 228 /// We read lots of Nini config, maybe set a timer, add members to state tracking Dictionaries, etc.
229 /// </summary> 229 /// </summary>
230 /// <param name="scene">The scene to (possibly) perform AutoBackup on.</param> 230 /// <param name="scene">The scene to (possibly) perform AutoBackup on.</param>
231 void IRegionModuleBase.RegionLoaded(Scene scene) 231 public void RegionLoaded(Scene scene)
232 { 232 {
233 if (!m_enabled) 233 if (!m_enabled)
234 return; 234 return;
@@ -258,7 +258,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
258 /// <summary> 258 /// <summary>
259 /// Currently a no-op. 259 /// Currently a no-op.
260 /// </summary> 260 /// </summary>
261 void ISharedRegionModule.PostInitialise() 261 public void PostInitialise()
262 { 262 {
263 } 263 }
264 264