aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2008-07-26 18:54:59 +0000
committerMelanie Thielker2008-07-26 18:54:59 +0000
commit2a1bc318b0db431f88a45735e58f15aad7316962 (patch)
tree20aa5cca4bd37c97491c5055fbcdc97992e04067 /OpenSim
parentRe-Fix the fix (diff)
downloadopensim-SC_OLD-2a1bc318b0db431f88a45735e58f15aad7316962.zip
opensim-SC_OLD-2a1bc318b0db431f88a45735e58f15aad7316962.tar.gz
opensim-SC_OLD-2a1bc318b0db431f88a45735e58f15aad7316962.tar.bz2
opensim-SC_OLD-2a1bc318b0db431f88a45735e58f15aad7316962.tar.xz
The hazards if unclean sourc trees. Yours truly got bitten this time.
Re-fix the re-fix from a clean build. This makes the region based settings work as advertised
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MySQL/MySQLDataStore.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs
index af3f02a..07f4c10 100644
--- a/OpenSim/Data/MySQL/MySQLDataStore.cs
+++ b/OpenSim/Data/MySQL/MySQLDataStore.cs
@@ -743,7 +743,10 @@ namespace OpenSim.Data.MySQL
743 } 743 }
744 DataRow row = rawsettings[0]; 744 DataRow row = rawsettings[0];
745 745
746 return buildRegionSettings(row); 746 RegionSettings newSettings = buildRegionSettings(row);
747 newSettings.OnSave += StoreRegionSettings;
748
749 return newSettings;
747 } 750 }
748 } 751 }
749 752
@@ -1272,7 +1275,6 @@ namespace OpenSim.Data.MySQL
1272 private static RegionSettings buildRegionSettings(DataRow row) 1275 private static RegionSettings buildRegionSettings(DataRow row)
1273 { 1276 {
1274 RegionSettings newSettings = new RegionSettings(); 1277 RegionSettings newSettings = new RegionSettings();
1275 newSettings.OnSave += StoreRegionSettings;
1276 1278
1277 newSettings.RegionUUID = new LLUUID((string) row["regionUUID"]); 1279 newSettings.RegionUUID = new LLUUID((string) row["regionUUID"]);
1278 newSettings.BlockTerraform = Convert.ToBoolean(row["block_terraform"]); 1280 newSettings.BlockTerraform = Convert.ToBoolean(row["block_terraform"]);