mirror of
https://github.com/opensim/opensim.git
synced 2026-08-04 16:22:50 +08:00
slightly simplify oar control file loading code
This commit is contained in:
committed by
Jonathan Freedman
parent
460b9fffe5
commit
772dbf59f3
@@ -483,15 +483,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
|
||||
/// <param name="data"></param>
|
||||
private void LoadControlFile(string path, byte[] data)
|
||||
{
|
||||
//Create the XmlNamespaceManager.
|
||||
NameTable nt = new NameTable();
|
||||
XmlNamespaceManager nsmgr = new XmlNamespaceManager(nt);
|
||||
|
||||
// Create the XmlParserContext.
|
||||
XmlNamespaceManager nsmgr = new XmlNamespaceManager(new NameTable());
|
||||
XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None);
|
||||
|
||||
XmlTextReader xtr
|
||||
= new XmlTextReader(Encoding.ASCII.GetString(data), XmlNodeType.Document, context);
|
||||
XmlTextReader xtr = new XmlTextReader(Encoding.ASCII.GetString(data), XmlNodeType.Document, context);
|
||||
|
||||
RegionSettings currentRegionSettings = m_scene.RegionInfo.RegionSettings;
|
||||
|
||||
@@ -530,10 +524,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
|
||||
currentRegionSettings.LoadedCreationID = xtr.ReadElementContentAsString();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
currentRegionSettings.Save();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user