aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-07-25 06:17:43 +0000
committerMelanie Thielker2008-07-25 06:17:43 +0000
commit5998fb712a7079c5ebd12223d43a91f18925372e (patch)
treebe185130e07aec93d771d298958887ecb2802533
parent* disclude ode unit testing until the native library issue can be resolved. (diff)
downloadopensim-SC_OLD-5998fb712a7079c5ebd12223d43a91f18925372e.zip
opensim-SC_OLD-5998fb712a7079c5ebd12223d43a91f18925372e.tar.gz
opensim-SC_OLD-5998fb712a7079c5ebd12223d43a91f18925372e.tar.bz2
opensim-SC_OLD-5998fb712a7079c5ebd12223d43a91f18925372e.tar.xz
Patch #9155 (Mantis #1793)
Fix a regression that caused the region settings not to save. Still no SQLite support for region settings. MySQL now functional.
-rw-r--r--OpenSim/Data/MySQL/MySQLDataStore.cs1
-rw-r--r--OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs3
2 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs
index 7482df3..8f3d904 100644
--- a/OpenSim/Data/MySQL/MySQLDataStore.cs
+++ b/OpenSim/Data/MySQL/MySQLDataStore.cs
@@ -735,6 +735,7 @@ namespace OpenSim.Data.MySQL
735 { 735 {
736 RegionSettings rs = new RegionSettings(); 736 RegionSettings rs = new RegionSettings();
737 rs.RegionUUID = regionUUID; 737 rs.RegionUUID = regionUUID;
738 rs.OnSave += StoreRegionSettings;
738 739
739 StoreRegionSettings(rs); 740 StoreRegionSettings(rs);
740 741
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
index c0fdc05..7ca1f3a 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
@@ -120,6 +120,9 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
120 120
121 public void setEstateTerrainBaseTexture(IClientAPI remoteClient, int corner, LLUUID texture) 121 public void setEstateTerrainBaseTexture(IClientAPI remoteClient, int corner, LLUUID texture)
122 { 122 {
123 if(texture == LLUUID.Zero)
124 return;
125
123 switch (corner) 126 switch (corner)
124 { 127 {
125 case 0: 128 case 0: