diff options
author | Melanie Thielker | 2008-07-18 19:32:05 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-07-18 19:32:05 +0000 |
commit | bbd076544d18961af02ee43b5e0b3f2c3e3c1133 (patch) | |
tree | c4db55323864044dd2621560e65ffbd428e98615 /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | pulling query handling through the handlers. adding (non-functional, (diff) | |
download | opensim-SC_OLD-bbd076544d18961af02ee43b5e0b3f2c3e3c1133.zip opensim-SC_OLD-bbd076544d18961af02ee43b5e0b3f2c3e3c1133.tar.gz opensim-SC_OLD-bbd076544d18961af02ee43b5e0b3f2c3e3c1133.tar.bz2 opensim-SC_OLD-bbd076544d18961af02ee43b5e0b3f2c3e3c1133.tar.xz |
Patch to fix saving of estate managers list loaded during migration.
No longer teleports an agent home unless their root agent is being banned.
Visual blocking is still in effect.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index bbb028d..aed104e 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -269,15 +269,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
269 | m_externalChecks = new SceneExternalChecks(this); | 269 | m_externalChecks = new SceneExternalChecks(this); |
270 | 270 | ||
271 | // Load region settings | 271 | // Load region settings |
272 | // First try database | ||
273 | m_regInfo.RegionSettings = m_storageManager.DataStore.LoadRegionSettings(m_regInfo.RegionID); | 272 | m_regInfo.RegionSettings = m_storageManager.DataStore.LoadRegionSettings(m_regInfo.RegionID); |
274 | // Hook up save event | ||
275 | m_regInfo.RegionSettings.OnSave += m_storageManager.DataStore.StoreRegionSettings; | ||
276 | if(m_storageManager.EstateDataStore != null) | 273 | if(m_storageManager.EstateDataStore != null) |
277 | { | ||
278 | m_regInfo.EstateSettings = m_storageManager.EstateDataStore.LoadEstateSettings(m_regInfo.RegionID); | 274 | m_regInfo.EstateSettings = m_storageManager.EstateDataStore.LoadEstateSettings(m_regInfo.RegionID); |
279 | m_regInfo.EstateSettings.OnSave += m_storageManager.EstateDataStore.StoreEstateSettings; | ||
280 | } | ||
281 | 275 | ||
282 | 276 | ||
283 | 277 | ||