diff options
author | Dr Scofield | 2008-09-18 15:44:05 +0000 |
---|---|---|
committer | Dr Scofield | 2008-09-18 15:44:05 +0000 |
commit | 03f246d6fea009f1812019f5f036987b96b47a2b (patch) | |
tree | f7194082d70c68a4cb64e92036d6613518fbd89c /OpenSim/Framework | |
parent | add some comments and some try blocks around object storage (diff) | |
download | opensim-SC-03f246d6fea009f1812019f5f036987b96b47a2b.zip opensim-SC-03f246d6fea009f1812019f5f036987b96b47a2b.tar.gz opensim-SC-03f246d6fea009f1812019f5f036987b96b47a2b.tar.bz2 opensim-SC-03f246d6fea009f1812019f5f036987b96b47a2b.tar.xz |
adds support to delete a region completely and offers that
functionality via the console command "delete-region" and also via
RemoteAdminPlugin.
minor typo fix.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 925c5be..5cbc776 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -196,6 +196,7 @@ namespace OpenSim.Framework | |||
196 | public bool commFailTF = false; | 196 | public bool commFailTF = false; |
197 | public ConfigurationMember configMember; | 197 | public ConfigurationMember configMember; |
198 | public string DataStore = String.Empty; | 198 | public string DataStore = String.Empty; |
199 | public string RegionFile = String.Empty; | ||
199 | public bool isSandbox = false; | 200 | public bool isSandbox = false; |
200 | private EstateSettings m_estateSettings; | 201 | private EstateSettings m_estateSettings; |
201 | private RegionSettings m_regionSettings; | 202 | private RegionSettings m_regionSettings; |
@@ -221,6 +222,7 @@ namespace OpenSim.Framework | |||
221 | configMember = | 222 | configMember = |
222 | new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig); | 223 | new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig); |
223 | configMember.performConfigurationRetrieve(); | 224 | configMember.performConfigurationRetrieve(); |
225 | RegionFile = filename; | ||
224 | } | 226 | } |
225 | 227 | ||
226 | public RegionInfo(string description, XmlNode xmlNode, bool skipConsoleConfig) | 228 | public RegionInfo(string description, XmlNode xmlNode, bool skipConsoleConfig) |
@@ -364,6 +366,7 @@ namespace OpenSim.Framework | |||
364 | configMember = new ConfigurationMember(filename, description, loadConfigurationOptionsFromMe, | 366 | configMember = new ConfigurationMember(filename, description, loadConfigurationOptionsFromMe, |
365 | ignoreIncomingConfiguration, false); | 367 | ignoreIncomingConfiguration, false); |
366 | configMember.performConfigurationRetrieve(); | 368 | configMember.performConfigurationRetrieve(); |
369 | RegionFile = filename; | ||
367 | } | 370 | } |
368 | 371 | ||
369 | public void loadConfigurationOptionsFromMe() | 372 | public void loadConfigurationOptionsFromMe() |