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.

2 files changed, 6 insertions, 0 deletions

diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs
index 17cd6a1..c0395a9 100644
--- a/OpenSim/Data/MySQL/MySQLEstateData.cs
+++ b/OpenSim/Data/MySQL/MySQLEstateData.cs
@@ -158,6 +158,7 @@ namespace OpenSim.Data.MySQL
         public EstateSettings LoadEstateSettings(LLUUID regionID)
         {
             EstateSettings es = new EstateSettings();
+            es.OnSave += StoreEstateSettings;
 
             string sql = "select estate_settings."+String.Join(",estate_settings.", FieldList)+" from estate_map left join estate_settings on estate_map.EstateID = estate_settings.EstateID where estate_settings.EstateID is not null and RegionID = ?RegionID";
 
@@ -258,6 +259,8 @@ namespace OpenSim.Data.MySQL
                 catch (Exception)
                 {
                 }
+
+                es.Save();
             }
 
             LoadBanList(es);
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index a8dfb4e..dd6145c 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -86,6 +86,7 @@ namespace OpenSim.Data.SQLite
         public EstateSettings LoadEstateSettings(LLUUID regionID)
         {
             EstateSettings es = new EstateSettings();
+            es.OnSave += StoreEstateSettings;
 
             string sql = "select estate_settings."+String.Join(",estate_settings.", FieldList)+" from estate_map left join estate_settings on estate_map.EstateID = estate_settings.EstateID where estate_settings.EstateID is not null and RegionID = @RegionID";
 
@@ -184,6 +185,8 @@ namespace OpenSim.Data.SQLite
                 catch (Exception)
                 {
                 }
+
+                es.Save();
             }
 
             LoadBanList(es);