Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 33 insertions, 6 deletions

diff --git a/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs b/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs
index 3dcc020..809d863 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs
@@ -70,6 +70,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             /// If null then the region doesn't have a corresponding scene, and it won't be loaded.
             /// </summary>
             public Scene Scene { get; set; }
+
+            /// <summary>
+            /// The size of the region being loaded.
+            /// </summary>
+            public Vector3 RegionSize { get; set; }
+
+            public RegionInfo()
+            {
+                RegionSize = new Vector3(256f,256f,float.MaxValue);
+            }
         }
 
         /// <summary>
@@ -113,23 +123,34 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         public void StartRegion()
         {
             m_curX = (m_curX == null) ? 0 : m_curX + 1;
-            // Note: this doesn't mean we have a real region in this location; this could just be a "hole"
+           // Note: this doesn't mean we have a real region in this location; this could just be a "hole"
         }
 
         public void SetRegionOriginalID(string id)
         {
             m_curRegion = new RegionInfo();
-            m_curRegion.Location = new Point((int)m_curX, (int)m_curY);
+            int x = (int)((m_curX == null) ? 0 : m_curX);
+            int y = (int)((m_curY == null) ? 0 : m_curY);
+
+            m_curRegion.Location = new Point(x, y);
             m_curRegion.OriginalID = id;
             // 'curRegion' will be saved in 'm_directory2region' when SetRegionDir() is called
         }
 
         public void SetRegionDirectory(string directory)
         {
-            m_curRegion.Directory = directory;
-            m_directory2region[directory] = m_curRegion;
+            if(m_curRegion != null)
+            {
+                m_curRegion.Directory = directory;
+                m_directory2region[directory] = m_curRegion;
+            }
         }
 
+        public void SetRegionSize(Vector3 size)
+        {
+            if(m_curRegion != null)
+                m_curRegion.RegionSize = size;
+        }
 
         /// <summary>
         /// Sets all the scenes present in the simulator.
@@ -145,7 +166,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         {
             foreach (RegionInfo archivedRegion in m_directory2region.Values)
             {
-                Point location = new Point((int)rootScene.RegionInfo.RegionLocX, (int)rootScene.RegionInfo.RegionLocY);
+                Point location = new Point((int)rootScene.RegionInfo.RegionLocX,
+                            (int)rootScene.RegionInfo.RegionLocY);
+
                 location.Offset(archivedRegion.Location);
 
                 Scene scene;
@@ -191,7 +214,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 return false;
             string regionDirectory = parts[1];
             relativePath = parts[2];
-            
+
             RegionInfo region;
             if (m_directory2region.TryGetValue(regionDirectory, out region))
             {
@@ -228,5 +251,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             return m_newId2region.Keys.ToList();
         }
 
+        public int GetScenesCount()
+        {
+            return m_directory2region.Count;
+        }
     }
 }