aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-10-22 18:47:38 +0100
committerJustin Clark-Casey (justincc)2010-10-22 18:47:38 +0100
commita5bb7b8a300a9dd0aceb3666423f2827a69e1930 (patch)
tree4259b6e713cf52b27ace66f9d7c5ddceac2a0485
parentwrite IAR control file first in the archive rather than last (diff)
downloadopensim-SC-a5bb7b8a300a9dd0aceb3666423f2827a69e1930.zip
opensim-SC-a5bb7b8a300a9dd0aceb3666423f2827a69e1930.tar.gz
opensim-SC-a5bb7b8a300a9dd0aceb3666423f2827a69e1930.tar.bz2
opensim-SC-a5bb7b8a300a9dd0aceb3666423f2827a69e1930.tar.xz
slightly simplify oar control file loading code
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs13
1 files changed, 3 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index f1f5258..9192f43 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -483,15 +483,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
483 /// <param name="data"></param> 483 /// <param name="data"></param>
484 private void LoadControlFile(string path, byte[] data) 484 private void LoadControlFile(string path, byte[] data)
485 { 485 {
486 //Create the XmlNamespaceManager. 486 XmlNamespaceManager nsmgr = new XmlNamespaceManager(new NameTable());
487 NameTable nt = new NameTable();
488 XmlNamespaceManager nsmgr = new XmlNamespaceManager(nt);
489
490 // Create the XmlParserContext.
491 XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None); 487 XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None);
492 488 XmlTextReader xtr = new XmlTextReader(Encoding.ASCII.GetString(data), XmlNodeType.Document, context);
493 XmlTextReader xtr
494 = new XmlTextReader(Encoding.ASCII.GetString(data), XmlNodeType.Document, context);
495 489
496 RegionSettings currentRegionSettings = m_scene.RegionInfo.RegionSettings; 490 RegionSettings currentRegionSettings = m_scene.RegionInfo.RegionSettings;
497 491
@@ -530,10 +524,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
530 currentRegionSettings.LoadedCreationID = xtr.ReadElementContentAsString(); 524 currentRegionSettings.LoadedCreationID = xtr.ReadElementContentAsString();
531 } 525 }
532 } 526 }
533
534 } 527 }
535 528
536 currentRegionSettings.Save(); 529 currentRegionSettings.Save();
537 } 530 }
538 } 531 }
539} 532} \ No newline at end of file