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/Data/MySQL | |
parent | pulling query handling through the handlers. adding (non-functional, (diff) | |
download | opensim-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/MySQL')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLEstateData.cs | 3 |
1 files changed, 3 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 | |||
158 | public EstateSettings LoadEstateSettings(LLUUID regionID) | 158 | public EstateSettings LoadEstateSettings(LLUUID regionID) |
159 | { | 159 | { |
160 | EstateSettings es = new EstateSettings(); | 160 | EstateSettings es = new EstateSettings(); |
161 | es.OnSave += StoreEstateSettings; | ||
161 | 162 | ||
162 | 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"; | 163 | 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"; |
163 | 164 | ||
@@ -258,6 +259,8 @@ namespace OpenSim.Data.MySQL | |||
258 | catch (Exception) | 259 | catch (Exception) |
259 | { | 260 | { |
260 | } | 261 | } |
262 | |||
263 | es.Save(); | ||
261 | } | 264 | } |
262 | 265 | ||
263 | LoadBanList(es); | 266 | LoadBanList(es); |