diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 7d77a77..1f85278 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
53 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 53 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
54 | 54 | ||
55 | /// <summary> | 55 | /// <summary> |
56 | /// The maximum major version of OAR that we can read. Minor versions shouldn't need a number since version | 56 | /// The maximum major version of OAR that we can read. Minor versions shouldn't need a max number since version |
57 | /// bumps here should be compatible. | 57 | /// bumps here should be compatible. |
58 | /// </summary> | 58 | /// </summary> |
59 | public static int MAX_MAJOR_VERSION = 0; | 59 | public static int MAX_MAJOR_VERSION = 0; |
@@ -499,17 +499,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
499 | /// </summary> | 499 | /// </summary> |
500 | /// <param name="path"></param> | 500 | /// <param name="path"></param> |
501 | /// <param name="data"></param> | 501 | /// <param name="data"></param> |
502 | private void LoadControlFile(string path, byte[] data) | 502 | protected void LoadControlFile(string path, byte[] data) |
503 | { | 503 | { |
504 | //Create the XmlNamespaceManager. | 504 | XmlNamespaceManager nsmgr = new XmlNamespaceManager(new NameTable()); |
505 | NameTable nt = new NameTable(); | ||
506 | XmlNamespaceManager nsmgr = new XmlNamespaceManager(nt); | ||
507 | |||
508 | // Create the XmlParserContext. | ||
509 | XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None); | 505 | XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None); |
510 | 506 | XmlTextReader xtr = new XmlTextReader(Encoding.ASCII.GetString(data), XmlNodeType.Document, context); | |
511 | XmlTextReader xtr | ||
512 | = new XmlTextReader(Encoding.ASCII.GetString(data), XmlNodeType.Document, context); | ||
513 | 507 | ||
514 | RegionSettings currentRegionSettings = m_scene.RegionInfo.RegionSettings; | 508 | RegionSettings currentRegionSettings = m_scene.RegionInfo.RegionSettings; |
515 | 509 | ||
@@ -548,10 +542,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
548 | currentRegionSettings.LoadedCreationID = xtr.ReadElementContentAsString(); | 542 | currentRegionSettings.LoadedCreationID = xtr.ReadElementContentAsString(); |
549 | } | 543 | } |
550 | } | 544 | } |
551 | |||
552 | } | 545 | } |
553 | 546 | ||
554 | currentRegionSettings.Save(); | 547 | currentRegionSettings.Save(); |
555 | } | 548 | } |
556 | } | 549 | } |
557 | } | 550 | } \ No newline at end of file |