diff options
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLSimulationData.cs')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 47 |
1 files changed, 4 insertions, 43 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index 81b5ec4..549d129 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
@@ -1105,7 +1105,7 @@ namespace OpenSim.Data.MySQL | |||
1105 | "use_estate_sun, fixed_sun, sun_position, " + | 1105 | "use_estate_sun, fixed_sun, sun_position, " + |
1106 | "covenant, covenant_datetime, Sandbox, sunvectorx, sunvectory, " + | 1106 | "covenant, covenant_datetime, Sandbox, sunvectorx, sunvectory, " + |
1107 | "sunvectorz, loaded_creation_datetime, " + | 1107 | "sunvectorz, loaded_creation_datetime, " + |
1108 | "loaded_creation_id, map_tile_ID, " + | 1108 | "loaded_creation_id, map_tile_ID, block_search, casino, " + |
1109 | "TelehubObject, parcel_tile_ID) " + | 1109 | "TelehubObject, parcel_tile_ID) " + |
1110 | "values (?RegionUUID, ?BlockTerraform, " + | 1110 | "values (?RegionUUID, ?BlockTerraform, " + |
1111 | "?BlockFly, ?AllowDamage, ?RestrictPushing, " + | 1111 | "?BlockFly, ?AllowDamage, ?RestrictPushing, " + |
@@ -1122,53 +1122,14 @@ namespace OpenSim.Data.MySQL | |||
1122 | "?SunPosition, ?Covenant, ?CovenantChangedDateTime, ?Sandbox, " + | 1122 | "?SunPosition, ?Covenant, ?CovenantChangedDateTime, ?Sandbox, " + |
1123 | "?SunVectorX, ?SunVectorY, ?SunVectorZ, " + | 1123 | "?SunVectorX, ?SunVectorY, ?SunVectorZ, " + |
1124 | "?LoadedCreationDateTime, ?LoadedCreationID, " + | 1124 | "?LoadedCreationDateTime, ?LoadedCreationID, " + |
1125 | "?TerrainImageID, " + | 1125 | "?TerrainImageID, ?block_search, ?casino, " + |
1126 | "?TelehubObject, ?ParcelImageID)"; | 1126 | "?TelehubObject, ?ParcelImageID)"; |
1127 | 1127 | ||
1128 | using (MySqlCommand cmd = dbcon.CreateCommand()) | ||
1129 | { | ||
1130 | cmd.CommandText = "replace into regionsettings (regionUUID, " + | ||
1131 | "block_terraform, block_fly, allow_damage, " + | ||
1132 | "restrict_pushing, allow_land_resell, " + | ||
1133 | "allow_land_join_divide, block_show_in_search, " + | ||
1134 | "agent_limit, object_bonus, maturity, " + | ||
1135 | "disable_scripts, disable_collisions, " + | ||
1136 | "disable_physics, terrain_texture_1, " + | ||
1137 | "terrain_texture_2, terrain_texture_3, " + | ||
1138 | "terrain_texture_4, elevation_1_nw, " + | ||
1139 | "elevation_2_nw, elevation_1_ne, " + | ||
1140 | "elevation_2_ne, elevation_1_se, " + | ||
1141 | "elevation_2_se, elevation_1_sw, " + | ||
1142 | "elevation_2_sw, water_height, " + | ||
1143 | "terrain_raise_limit, terrain_lower_limit, " + | ||
1144 | "use_estate_sun, fixed_sun, sun_position, " + | ||
1145 | "covenant, covenant_datetime, Sandbox, sunvectorx, sunvectory, " + | ||
1146 | "sunvectorz, loaded_creation_datetime, " + | ||
1147 | "loaded_creation_id, map_tile_ID, block_search, casino, " + | ||
1148 | "TelehubObject, parcel_tile_ID) " + | ||
1149 | "values (?RegionUUID, ?BlockTerraform, " + | ||
1150 | "?BlockFly, ?AllowDamage, ?RestrictPushing, " + | ||
1151 | "?AllowLandResell, ?AllowLandJoinDivide, " + | ||
1152 | "?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " + | ||
1153 | "?Maturity, ?DisableScripts, ?DisableCollisions, " + | ||
1154 | "?DisablePhysics, ?TerrainTexture1, " + | ||
1155 | "?TerrainTexture2, ?TerrainTexture3, " + | ||
1156 | "?TerrainTexture4, ?Elevation1NW, ?Elevation2NW, " + | ||
1157 | "?Elevation1NE, ?Elevation2NE, ?Elevation1SE, " + | ||
1158 | "?Elevation2SE, ?Elevation1SW, ?Elevation2SW, " + | ||
1159 | "?WaterHeight, ?TerrainRaiseLimit, " + | ||
1160 | "?TerrainLowerLimit, ?UseEstateSun, ?FixedSun, " + | ||
1161 | "?SunPosition, ?Covenant, ?CovenantChangedDateTime, ?Sandbox, " + | ||
1162 | "?SunVectorX, ?SunVectorY, ?SunVectorZ, " + | ||
1163 | "?LoadedCreationDateTime, ?LoadedCreationID, " + | ||
1164 | "?TerrainImageID, ?block_search, ?casino, " + | ||
1165 | "?TelehubObject, ?ParcelImageID)"; | ||
1166 | |||
1167 | ExecuteNonQuery(cmd); | 1128 | ExecuteNonQuery(cmd); |
1168 | } | 1129 | } |
1169 | } | ||
1170 | 1130 | ||
1171 | SaveSpawnPoints(rs); | 1131 | SaveSpawnPoints(rs); |
1132 | } | ||
1172 | } | 1133 | } |
1173 | 1134 | ||
1174 | public virtual List<LandData> LoadLandObjects(UUID regionUUID) | 1135 | public virtual List<LandData> LoadLandObjects(UUID regionUUID) |