aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
diff options
context:
space:
mode:
authorMelanie2010-05-10 03:57:44 +0100
committerMelanie2010-05-10 03:57:44 +0100
commit3e8ceb350972a1d00c4163fecd8172602cdcd865 (patch)
tree9a23412c280440ff1762999c2d93fdd2685d0196 /OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
parentFix a null ref on region crossing (diff)
parentOK, this really fixes it, I promise. (diff)
downloadopensim-SC_OLD-3e8ceb350972a1d00c4163fecd8172602cdcd865.zip
opensim-SC_OLD-3e8ceb350972a1d00c4163fecd8172602cdcd865.tar.gz
opensim-SC_OLD-3e8ceb350972a1d00c4163fecd8172602cdcd865.tar.bz2
opensim-SC_OLD-3e8ceb350972a1d00c4163fecd8172602cdcd865.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLLegacyRegionData.cs')
-rw-r--r--OpenSim/Data/MySQL/MySQLLegacyRegionData.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
index a395ddc..07371e7 100644
--- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
@@ -975,7 +975,7 @@ namespace OpenSim.Data.MySQL
975 "use_estate_sun, fixed_sun, sun_position, " + 975 "use_estate_sun, fixed_sun, sun_position, " +
976 "covenant, Sandbox, sunvectorx, sunvectory, " + 976 "covenant, Sandbox, sunvectorx, sunvectory, " +
977 "sunvectorz, loaded_creation_datetime, " + 977 "sunvectorz, loaded_creation_datetime, " +
978 "loaded_creation_id) values (?RegionUUID, ?BlockTerraform, " + 978 "loaded_creation_id, map_tile_ID) values (?RegionUUID, ?BlockTerraform, " +
979 "?BlockFly, ?AllowDamage, ?RestrictPushing, " + 979 "?BlockFly, ?AllowDamage, ?RestrictPushing, " +
980 "?AllowLandResell, ?AllowLandJoinDivide, " + 980 "?AllowLandResell, ?AllowLandJoinDivide, " +
981 "?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " + 981 "?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " +
@@ -989,7 +989,8 @@ namespace OpenSim.Data.MySQL
989 "?TerrainLowerLimit, ?UseEstateSun, ?FixedSun, " + 989 "?TerrainLowerLimit, ?UseEstateSun, ?FixedSun, " +
990 "?SunPosition, ?Covenant, ?Sandbox, " + 990 "?SunPosition, ?Covenant, ?Sandbox, " +
991 "?SunVectorX, ?SunVectorY, ?SunVectorZ, " + 991 "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
992 "?LoadedCreationDateTime, ?LoadedCreationID)"; 992 "?LoadedCreationDateTime, ?LoadedCreationID, " +
993 "?TerrainImageID)";
993 994
994 FillRegionSettingsCommand(cmd, rs); 995 FillRegionSettingsCommand(cmd, rs);
995 996
@@ -1276,6 +1277,8 @@ namespace OpenSim.Data.MySQL
1276 else 1277 else
1277 newSettings.LoadedCreationID = (String) row["loaded_creation_id"]; 1278 newSettings.LoadedCreationID = (String) row["loaded_creation_id"];
1278 1279
1280 newSettings.TerrainImageID = new UUID((String)row["map_tile_ID"]);
1281
1279 return newSettings; 1282 return newSettings;
1280 } 1283 }
1281 1284
@@ -1596,6 +1599,7 @@ namespace OpenSim.Data.MySQL
1596 cmd.Parameters.AddWithValue("Covenant", settings.Covenant.ToString()); 1599 cmd.Parameters.AddWithValue("Covenant", settings.Covenant.ToString());
1597 cmd.Parameters.AddWithValue("LoadedCreationDateTime", settings.LoadedCreationDateTime); 1600 cmd.Parameters.AddWithValue("LoadedCreationDateTime", settings.LoadedCreationDateTime);
1598 cmd.Parameters.AddWithValue("LoadedCreationID", settings.LoadedCreationID); 1601 cmd.Parameters.AddWithValue("LoadedCreationID", settings.LoadedCreationID);
1602 cmd.Parameters.AddWithValue("TerrainImageID", settings.TerrainImageID);
1599 1603
1600 } 1604 }
1601 1605