diff options
| author | Justin Clark-Casey (justincc) | 2010-10-22 19:24:42 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-10-22 19:24:42 +0100 |
| commit | 199b61f1b2c48c82c5878032acfa9b69e4898fec (patch) | |
| tree | 740062b018a54a0b50202dd89e3586fc2906f7a1 /OpenSim/Region/CoreModules/World | |
| parent | slightly simplify oar control file loading code (diff) | |
| download | opensim-SC_OLD-199b61f1b2c48c82c5878032acfa9b69e4898fec.zip opensim-SC_OLD-199b61f1b2c48c82c5878032acfa9b69e4898fec.tar.gz opensim-SC_OLD-199b61f1b2c48c82c5878032acfa9b69e4898fec.tar.bz2 opensim-SC_OLD-199b61f1b2c48c82c5878032acfa9b69e4898fec.tar.xz | |
start parsing iar control file
This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 9192f43..087d3df 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
| @@ -481,7 +481,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
| 481 | /// </summary> | 481 | /// </summary> |
| 482 | /// <param name="path"></param> | 482 | /// <param name="path"></param> |
| 483 | /// <param name="data"></param> | 483 | /// <param name="data"></param> |
| 484 | private void LoadControlFile(string path, byte[] data) | 484 | protected void LoadControlFile(string path, byte[] data) |
| 485 | { | 485 | { |
| 486 | XmlNamespaceManager nsmgr = new XmlNamespaceManager(new NameTable()); | 486 | XmlNamespaceManager nsmgr = new XmlNamespaceManager(new NameTable()); |
| 487 | XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None); | 487 | XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None); |