aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2010-03-22 18:49:56 +0000
committerMelanie2010-03-22 18:49:56 +0000
commit70b0e07d1ea99f8bd88f2be12bf9b53a39187f60 (patch)
tree0093de7003392ff5edd246e82fa3fcb2b216cff1 /OpenSim/Region
parentFix a nullref in permissions when returning objects via right-click (diff)
downloadopensim-SC_OLD-70b0e07d1ea99f8bd88f2be12bf9b53a39187f60.zip
opensim-SC_OLD-70b0e07d1ea99f8bd88f2be12bf9b53a39187f60.tar.gz
opensim-SC_OLD-70b0e07d1ea99f8bd88f2be12bf9b53a39187f60.tar.bz2
opensim-SC_OLD-70b0e07d1ea99f8bd88f2be12bf9b53a39187f60.tar.xz
Remove the reading of estate_settings.xml and the associated processing of
defaults. Adding code to facilitate estate creation / managemment as part of first time start up
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs b/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs
index 668ff98..6861544 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Region.Framework.Interfaces
34 { 34 {
35 void Initialise(string connectstring); 35 void Initialise(string connectstring);
36 36
37 EstateSettings LoadEstateSettings(UUID regionID); 37 EstateSettings LoadEstateSettings(UUID regionID, bool create);
38 void StoreEstateSettings(EstateSettings es); 38 void StoreEstateSettings(EstateSettings es);
39 } 39 }
40} 40}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 2080687..078cf03 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -604,7 +604,7 @@ namespace OpenSim.Region.Framework.Scenes
604 m_regInfo.RegionSettings = m_storageManager.DataStore.LoadRegionSettings(m_regInfo.RegionID); 604 m_regInfo.RegionSettings = m_storageManager.DataStore.LoadRegionSettings(m_regInfo.RegionID);
605 if (m_storageManager.EstateDataStore != null) 605 if (m_storageManager.EstateDataStore != null)
606 { 606 {
607 m_regInfo.EstateSettings = m_storageManager.EstateDataStore.LoadEstateSettings(m_regInfo.RegionID); 607 m_regInfo.EstateSettings = m_storageManager.EstateDataStore.LoadEstateSettings(m_regInfo.RegionID, true);
608 } 608 }
609 609
610 //Bind Storage Manager functions to some land manager functions for this scene 610 //Bind Storage Manager functions to some land manager functions for this scene