ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 04:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Patch to fix saving of estate managers list loaded during migration.

Browse Source 
No longer teleports an agent home unless their root agent is being banned.
Visual blocking is still in effect.
This commit is contained in:
Melanie Thielker
2008-07-18 19:32:05 +00:00
parent 6a7d544497
commit bbd076544d
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
View File

@@ -245,7 +245,8 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
ScenePresence s = m_scene.GetScenePresence(user);
if (s != null)
{
m_scene.TeleportClientHome(user, s.ControllingClient);
if(!s.IsChildAgent)
m_scene.TeleportClientHome(user, s.ControllingClient);
}
}

6
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@@ -269,15 +269,9 @@ namespace OpenSim.Region.Environment.Scenes
m_externalChecks = new SceneExternalChecks(this);
// Load region settings
// First try database
m_regInfo.RegionSettings = m_storageManager.DataStore.LoadRegionSettings(m_regInfo.RegionID);
// Hook up save event
m_regInfo.RegionSettings.OnSave += m_storageManager.DataStore.StoreRegionSettings;
if(m_storageManager.EstateDataStore != null)
{
m_regInfo.EstateSettings = m_storageManager.EstateDataStore.LoadEstateSettings(m_regInfo.RegionID);
m_regInfo.EstateSettings.OnSave += m_storageManager.EstateDataStore.StoreEstateSettings;
}