aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteEstateData.cs
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/Data/SQLite/SQLiteEstateData.cs
parentpulling query handling through the handlers. adding (non-functional, (diff)
downloadopensim-SC-bbd076544d18961af02ee43b5e0b3f2c3e3c1133.zip
opensim-SC-bbd076544d18961af02ee43b5e0b3f2c3e3c1133.tar.gz
opensim-SC-bbd076544d18961af02ee43b5e0b3f2c3e3c1133.tar.bz2
opensim-SC-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/Data/SQLite/SQLiteEstateData.cs')
-rw-r--r--OpenSim/Data/SQLite/SQLiteEstateData.cs3
1 files changed, 3 insertions, 0 deletions
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
86 public EstateSettings LoadEstateSettings(LLUUID regionID) 86 public EstateSettings LoadEstateSettings(LLUUID regionID)
87 { 87 {
88 EstateSettings es = new EstateSettings(); 88 EstateSettings es = new EstateSettings();
89 es.OnSave += StoreEstateSettings;
89 90
90 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"; 91 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";
91 92
@@ -184,6 +185,8 @@ namespace OpenSim.Data.SQLite
184 catch (Exception) 185 catch (Exception)
185 { 186 {
186 } 187 }
188
189 es.Save();
187 } 190 }
188 191
189 LoadBanList(es); 192 LoadBanList(es);