From 6600aa2baf56e1f58e50eb5589de876e910131bb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 18 Apr 2011 22:35:33 +0100
Subject: Add regression test to check that OARs start with the control file.
---
OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs')
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index fd8f546..82bef48 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -57,6 +57,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
/// bumps here should be compatible.
///
public static int MAX_MAJOR_VERSION = 1;
+
+ ///
+ /// Has the control file been loaded for this archive?
+ ///
+ public bool ControlFileLoaded { get; private set; }
protected Scene m_scene;
protected Stream m_loadStream;
@@ -527,7 +532,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
///
///
///
- protected void LoadControlFile(string path, byte[] data)
+ public void LoadControlFile(string path, byte[] data)
{
XmlNamespaceManager nsmgr = new XmlNamespaceManager(new NameTable());
XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None);
@@ -573,6 +578,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
}
currentRegionSettings.Save();
+
+ ControlFileLoaded = true;
}
}
}
\ No newline at end of file
--
cgit v1.1