1 files changed, 22 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
index 268b9b5..6ad11ee 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
@@ -26,6 +26,7 @@
  */
 
 using OpenSim.Region.Environment.Scenes;
+using System;
 using System.Reflection;
 using log4net;
 
@@ -38,6 +39,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);        
         
+        protected static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding();        
+        
         private Scene m_scene;
         private string m_loadPath;
 
@@ -53,6 +56,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
         {   
             TarArchiveReader archive = new TarArchiveReader(m_loadPath);
             
+            string serializedPrims = string.Empty;
+            
             // Just test for now by reading first file
             string filePath = "ERROR";
             
@@ -60,11 +65,27 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             while ((data = archive.ReadEntry(out filePath)) != null)
             {                            
                 m_log.DebugFormat("[ARCHIVER]: Successfully read {0} ({1} bytes) from archive {2}", filePath, data.Length, m_loadPath);
+                
+                if (filePath.Equals(ArchiveConstants.PRIMS_PATH))
+                {
+                    serializedPrims = m_asciiEncoding.GetString(data);
+                }
             }
             
-            m_log.DebugFormat("[ARCHIVER]: Reached end of archive");
+            m_log.DebugFormat("[ARCHIVER]: Reached end of archive");                        
             
             archive.Close();
+            
+            if (serializedPrims.Equals(string.Empty))
+            {
+                m_log.ErrorFormat("[ARCHIVER]: Archive did not contain a {0} file", ArchiveConstants.PRIMS_PATH);
+                return;
+            }
+            
+            // Reload serialized prims
+            m_log.InfoFormat("[ARCHIVER]: Loading prim data");
+            
+            //m_scene.LoadPrimsFromXml2(
         }
     }
 }