aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs
diff options
context:
space:
mode:
authorMelanie Thielker2014-04-26 02:43:13 +0200
committerMelanie Thielker2014-04-26 02:43:13 +0200
commit1d1e444aed5f9eb3a77092f01f1f4d4ed3e18d11 (patch)
tree6e91439904251bcf7a1075757b6feb94b9872cab /OpenSim/Framework/RegionInfo.cs
parentAllow opening a https port using only http so that nginx can be used for ssl (diff)
downloadopensim-SC-1d1e444aed5f9eb3a77092f01f1f4d4ed3e18d11.zip
opensim-SC-1d1e444aed5f9eb3a77092f01f1f4d4ed3e18d11.tar.gz
opensim-SC-1d1e444aed5f9eb3a77092f01f1f4d4ed3e18d11.tar.bz2
opensim-SC-1d1e444aed5f9eb3a77092f01f1f4d4ed3e18d11.tar.xz
Convert region loading to new format
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r--OpenSim/Framework/RegionInfo.cs10
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 6dde62f..24ec181 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -224,10 +224,12 @@ namespace OpenSim.Framework
224 // 224 //
225 public RegionInfo(string description, XmlNode xmlNode, bool skipConsoleConfig, IConfigSource configSource) 225 public RegionInfo(string description, XmlNode xmlNode, bool skipConsoleConfig, IConfigSource configSource)
226 { 226 {
227 // m_configSource = configSource; 227 XmlElement elem = (XmlElement)xmlNode;
228 configMember = 228 string name = elem.GetAttribute("Name");
229 new ConfigurationMember(xmlNode, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig); 229 string xmlstr = "<Nini>" + xmlNode.OuterXml + "</Nini>";
230 configMember.performConfigurationRetrieve(); 230 XmlConfigSource source = new XmlConfigSource(XmlReader.Create(new StringReader(xmlstr)));
231 ReadNiniConfig(source, name);
232
231 m_serverURI = string.Empty; 233 m_serverURI = string.Empty;
232 } 234 }
233 235