1 files changed, 25 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 828cb75..8277f39 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -225,9 +225,15 @@ namespace OpenSim.Region.Environment.Scenes
             m_physicalPrim = physicalPrim;
             m_sendTasksToChild = SendTasksToChild;
 
+            m_eventManager = new EventManager();
+
             m_LandManager = new LandManager(this, m_regInfo);
+
+            //Bind Storage Manager functions to some land manager functions for this scene
+            m_LandManager.OnLandObjectAdded += new LandManager.LandObjectAdded(m_storageManager.DataStore.StoreLandObject);
+            m_LandManager.OnLandObjectRemoved += new LandManager.LandObjectRemoved(m_storageManager.DataStore.RemoveLandObject);
+            
             m_estateManager = new EstateManager(this, m_regInfo);
-            m_eventManager = new EventManager();
 
             m_permissionManager = permissionManager;
             m_permissionManager.Initialise(this);
@@ -833,6 +839,24 @@ namespace OpenSim.Region.Environment.Scenes
 
         #endregion
 
+        #region Load Land
+
+        public void loadAllLandObjectsFromStorage()
+        {
+            MainLog.Instance.Verbose("SCENE", "Loading land objects from storage");
+            List<Framework.LandData> landData = m_storageManager.DataStore.LoadLandObjects(RegionInfo.RegionID);
+            if (landData.Count == 0)
+            {
+                m_LandManager.NoLandDataFromStorage();
+            }
+            else
+            {
+                m_LandManager.IncomingLandObjectsFromStorage(landData);
+            }
+        }
+        
+        #endregion
+
         #region Primitives Methods
 
         /// <summary>