aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs26
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
225 m_physicalPrim = physicalPrim; 225 m_physicalPrim = physicalPrim;
226 m_sendTasksToChild = SendTasksToChild; 226 m_sendTasksToChild = SendTasksToChild;
227 227
228 m_eventManager = new EventManager();
229
228 m_LandManager = new LandManager(this, m_regInfo); 230 m_LandManager = new LandManager(this, m_regInfo);
231
232 //Bind Storage Manager functions to some land manager functions for this scene
233 m_LandManager.OnLandObjectAdded += new LandManager.LandObjectAdded(m_storageManager.DataStore.StoreLandObject);
234 m_LandManager.OnLandObjectRemoved += new LandManager.LandObjectRemoved(m_storageManager.DataStore.RemoveLandObject);
235
229 m_estateManager = new EstateManager(this, m_regInfo); 236 m_estateManager = new EstateManager(this, m_regInfo);
230 m_eventManager = new EventManager();
231 237
232 m_permissionManager = permissionManager; 238 m_permissionManager = permissionManager;
233 m_permissionManager.Initialise(this); 239 m_permissionManager.Initialise(this);
@@ -833,6 +839,24 @@ namespace OpenSim.Region.Environment.Scenes
833 839
834 #endregion 840 #endregion
835 841
842 #region Load Land
843
844 public void loadAllLandObjectsFromStorage()
845 {
846 MainLog.Instance.Verbose("SCENE", "Loading land objects from storage");
847 List<Framework.LandData> landData = m_storageManager.DataStore.LoadLandObjects(RegionInfo.RegionID);
848 if (landData.Count == 0)
849 {
850 m_LandManager.NoLandDataFromStorage();
851 }
852 else
853 {
854 m_LandManager.IncomingLandObjectsFromStorage(landData);
855 }
856 }
857
858 #endregion
859
836 #region Primitives Methods 860 #region Primitives Methods
837 861
838 /// <summary> 862 /// <summary>