aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2008-07-14 01:29:48 +0000
committerMelanie Thielker2008-07-14 01:29:48 +0000
commit12173034d94e7deb245bb7e3d1bf8099432ec3b8 (patch)
treea2f231032650fae46b460ede019786b1562dc4aa /OpenSim
parentPatch #9147 (diff)
downloadopensim-SC_OLD-12173034d94e7deb245bb7e3d1bf8099432ec3b8.zip
opensim-SC_OLD-12173034d94e7deb245bb7e3d1bf8099432ec3b8.tar.gz
opensim-SC_OLD-12173034d94e7deb245bb7e3d1bf8099432ec3b8.tar.bz2
opensim-SC_OLD-12173034d94e7deb245bb7e3d1bf8099432ec3b8.tar.xz
Patch #9148
Patch 5 in the region settings series. Adds a migration to ensure corrupted data is purged and re-read from defaults. Some changes. Still no full functionality
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MySQL/Resources/010_RegionStore.sql9
-rw-r--r--OpenSim/Data/SQLite/Resources/005_RegionStore.sql5
-rw-r--r--OpenSim/Framework/RegionSettings.cs22
3 files changed, 25 insertions, 11 deletions
diff --git a/OpenSim/Data/MySQL/Resources/010_RegionStore.sql b/OpenSim/Data/MySQL/Resources/010_RegionStore.sql
new file mode 100644
index 0000000..031a746
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/010_RegionStore.sql
@@ -0,0 +1,9 @@
1# 1 "010_RegionStore.sql"
2# 1 "<built-in>"
3# 1 "<command line>"
4# 1 "010_RegionStore.sql"
5BEGIN;
6
7DELETE FROM regionsettings;
8
9COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/005_RegionStore.sql b/OpenSim/Data/SQLite/Resources/005_RegionStore.sql
new file mode 100644
index 0000000..1f6d1bd
--- /dev/null
+++ b/OpenSim/Data/SQLite/Resources/005_RegionStore.sql
@@ -0,0 +1,5 @@
1BEGIN;
2
3delete from regionsettings;
4
5COMMIT;
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index f525da0..3b24901 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -68,19 +68,19 @@ namespace OpenSim.Framework
68 ConfigurationOption.ConfigurationTypes.TYPE_INT32, 68 ConfigurationOption.ConfigurationTypes.TYPE_INT32,
69 String.Empty, "21", true); 69 String.Empty, "21", true);
70 70
71 configMember.addConfigurationOption("terrain_detail_0", 71 configMember.addConfigurationOption("terrain_base_0",
72 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 72 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
73 String.Empty, "00000000-0000-0000-0000-000000000000",true); 73 String.Empty, "00000000-0000-0000-0000-000000000000",true);
74 74
75 configMember.addConfigurationOption("terrain_detail_1", 75 configMember.addConfigurationOption("terrain_base_1",
76 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 76 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
77 String.Empty, "00000000-0000-0000-0000-000000000000",true); 77 String.Empty, "00000000-0000-0000-0000-000000000000",true);
78 78
79 configMember.addConfigurationOption("terrain_detail_2", 79 configMember.addConfigurationOption("terrain_base_2",
80 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 80 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
81 String.Empty, "00000000-0000-0000-0000-000000000000",true); 81 String.Empty, "00000000-0000-0000-0000-000000000000",true);
82 82
83 configMember.addConfigurationOption("terrain_detail_3", 83 configMember.addConfigurationOption("terrain_base_3",
84 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 84 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
85 String.Empty, "00000000-0000-0000-0000-000000000000",true); 85 String.Empty, "00000000-0000-0000-0000-000000000000",true);
86 86
@@ -176,17 +176,17 @@ namespace OpenSim.Framework
176 else 176 else
177 m_Maturity = 1; 177 m_Maturity = 1;
178 break; 178 break;
179 case "terrain_detail_0": 179 case "terrain_base_0":
180 m_TerrainTexture1 = (LLUUID)value; 180 m_TerrainTexture1 = (LLUUID)value;
181 break; 181 break;
182 case "terrain_detail_1": 182 case "terrain_base_1":
183 m_TerrainTexture1 = (LLUUID)value; 183 m_TerrainTexture2 = (LLUUID)value;
184 break; 184 break;
185 case "terrain_detail_2": 185 case "terrain_base_2":
186 m_TerrainTexture1 = (LLUUID)value; 186 m_TerrainTexture3 = (LLUUID)value;
187 break; 187 break;
188 case "terrain_detail_3": 188 case "terrain_base_3":
189 m_TerrainTexture1 = (LLUUID)value; 189 m_TerrainTexture4 = (LLUUID)value;
190 break; 190 break;
191 case "terrain_start_height_0": 191 case "terrain_start_height_0":
192 m_Elevation1SW = (double)value; 192 m_Elevation1SW = (double)value;