aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMelanie Thielker2008-07-18 19:32:05 +0000
committerMelanie Thielker2008-07-18 19:32:05 +0000
commitbbd076544d18961af02ee43b5e0b3f2c3e3c1133 (patch)
treec4db55323864044dd2621560e65ffbd428e98615 /OpenSim/Region/Environment
parentpulling query handling through the handlers. adding (non-functional, (diff)
downloadopensim-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 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs6
2 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
index f2b6ae0..ab0adf2 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
@@ -245,7 +245,8 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
245 ScenePresence s = m_scene.GetScenePresence(user); 245 ScenePresence s = m_scene.GetScenePresence(user);
246 if (s != null) 246 if (s != null)
247 { 247 {
248 m_scene.TeleportClientHome(user, s.ControllingClient); 248 if(!s.IsChildAgent)
249 m_scene.TeleportClientHome(user, s.ControllingClient);
249 } 250 }
250 251
251 } 252 }
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