Convert region loading to new format
parent
5c661baf6c
commit
1d1e444aed
|
@ -224,10 +224,12 @@ namespace OpenSim.Framework
|
|||
//
|
||||
public RegionInfo(string description, XmlNode xmlNode, bool skipConsoleConfig, IConfigSource configSource)
|
||||
{
|
||||
// m_configSource = configSource;
|
||||
configMember =
|
||||
new ConfigurationMember(xmlNode, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig);
|
||||
configMember.performConfigurationRetrieve();
|
||||
XmlElement elem = (XmlElement)xmlNode;
|
||||
string name = elem.GetAttribute("Name");
|
||||
string xmlstr = "<Nini>" + xmlNode.OuterXml + "</Nini>";
|
||||
XmlConfigSource source = new XmlConfigSource(XmlReader.Create(new StringReader(xmlstr)));
|
||||
ReadNiniConfig(source, name);
|
||||
|
||||
m_serverURI = string.Empty;
|
||||
}
|
||||
|
||||
|
|
|
@ -93,8 +93,8 @@ namespace OpenSim.Framework.RegionLoader.Web
|
|||
xmlSource.Length);
|
||||
XmlDocument xmlDoc = new XmlDocument();
|
||||
xmlDoc.LoadXml(xmlSource);
|
||||
if (xmlDoc.FirstChild.Name == "Regions")
|
||||
{
|
||||
if (xmlDoc.FirstChild.Name == "Nini")
|
||||
{
|
||||
regionCount = xmlDoc.FirstChild.ChildNodes.Count;
|
||||
|
||||
if (regionCount > 0)
|
||||
|
|
Loading…
Reference in New Issue