OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
0.6.0-stable
Melanie Thielker 2008-07-14 01:29:48 +00:00
parent e712678689
commit 12173034d9
3 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Data/MySQL/Resources/010_RegionStore.sql Normal file
View File

@ -0,0 +1,9 @@
# 1 "010_RegionStore.sql"
# 1 "<built-in>"
# 1 "<command line>"
# 1 "010_RegionStore.sql"
BEGIN;
DELETE FROM regionsettings;
COMMIT;

5
OpenSim/Data/SQLite/Resources/005_RegionStore.sql Normal file
View File

@ -0,0 +1,5 @@
BEGIN;
delete from regionsettings;
COMMIT;

22
OpenSim/Framework/RegionSettings.cs
View File

@ -68,19 +68,19 @@ namespace OpenSim.Framework
ConfigurationOption.ConfigurationTypes.TYPE_INT32,
String.Empty, "21", true);
configMember.addConfigurationOption("terrain_detail_0",
configMember.addConfigurationOption("terrain_base_0",
ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
String.Empty, "00000000-0000-0000-0000-000000000000",true);
configMember.addConfigurationOption("terrain_detail_1",
configMember.addConfigurationOption("terrain_base_1",
ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
String.Empty, "00000000-0000-0000-0000-000000000000",true);
configMember.addConfigurationOption("terrain_detail_2",
configMember.addConfigurationOption("terrain_base_2",
ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
String.Empty, "00000000-0000-0000-0000-000000000000",true);
configMember.addConfigurationOption("terrain_detail_3",
configMember.addConfigurationOption("terrain_base_3",
ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
String.Empty, "00000000-0000-0000-0000-000000000000",true);
@ -176,17 +176,17 @@ namespace OpenSim.Framework
else
m_Maturity = 1;
break;
case "terrain_detail_0":
case "terrain_base_0":
m_TerrainTexture1 = (LLUUID)value;
break;
case "terrain_detail_1":
m_TerrainTexture1 = (LLUUID)value;
case "terrain_base_1":
m_TerrainTexture2 = (LLUUID)value;
break;
case "terrain_detail_2":
m_TerrainTexture1 = (LLUUID)value;
case "terrain_base_2":
m_TerrainTexture3 = (LLUUID)value;
break;
case "terrain_detail_3":
m_TerrainTexture1 = (LLUUID)value;
case "terrain_base_3":
m_TerrainTexture4 = (LLUUID)value;
break;
case "terrain_start_height_0":
m_Elevation1SW = (double)value;