at last we can login and see objects ( friends is dead and disable in

 scenepresence)

1 files changed, 37 insertions, 64 deletions

diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 549d129..a62d347 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -1089,42 +1089,43 @@ namespace OpenSim.Data.MySQL
                 using (MySqlCommand cmd = dbcon.CreateCommand())
                 {
                     cmd.CommandText = "replace into regionsettings (regionUUID, " +
-                        "block_terraform, block_fly, allow_damage, " +
-                        "restrict_pushing, allow_land_resell, " +
-                        "allow_land_join_divide, block_show_in_search, " +
-                        "agent_limit, object_bonus, maturity, " +
-                        "disable_scripts, disable_collisions, " +
-                        "disable_physics, terrain_texture_1, " +
-                        "terrain_texture_2, terrain_texture_3, " +
-                        "terrain_texture_4, elevation_1_nw, " +
-                        "elevation_2_nw, elevation_1_ne, " +
-                        "elevation_2_ne, elevation_1_se, " +
-                        "elevation_2_se, elevation_1_sw, " +
-                        "elevation_2_sw, water_height, " +
-                        "terrain_raise_limit, terrain_lower_limit, " +
-                        "use_estate_sun, fixed_sun, sun_position, " +
-                        "covenant, covenant_datetime, Sandbox, sunvectorx, sunvectory, " +
-                        "sunvectorz, loaded_creation_datetime, " +
-                        "loaded_creation_id, map_tile_ID, block_search, casino, " +
-                        "TelehubObject, parcel_tile_ID) " +
-                         "values (?RegionUUID, ?BlockTerraform, " +
-                        "?BlockFly, ?AllowDamage, ?RestrictPushing, " +
-                        "?AllowLandResell, ?AllowLandJoinDivide, " +
-                        "?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " +
-                        "?Maturity, ?DisableScripts, ?DisableCollisions, " +
-                        "?DisablePhysics, ?TerrainTexture1, " +
-                        "?TerrainTexture2, ?TerrainTexture3, " +
-                        "?TerrainTexture4, ?Elevation1NW, ?Elevation2NW, " +
-                        "?Elevation1NE, ?Elevation2NE, ?Elevation1SE, " +
-                        "?Elevation2SE, ?Elevation1SW, ?Elevation2SW, " +
-                        "?WaterHeight, ?TerrainRaiseLimit, " +
-                        "?TerrainLowerLimit, ?UseEstateSun, ?FixedSun, " +
-                        "?SunPosition, ?Covenant, ?CovenantChangedDateTime, ?Sandbox, " +
-                        "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
-                        "?LoadedCreationDateTime, ?LoadedCreationID, " +
-                        "?TerrainImageID, ?block_search, ?casino, " +
-                        "?TelehubObject, ?ParcelImageID)";
-
+                         "block_terraform, block_fly, allow_damage, " +
+                         "restrict_pushing, allow_land_resell, " +
+                         "allow_land_join_divide, block_show_in_search, " +
+                         "agent_limit, object_bonus, maturity, " +
+                         "disable_scripts, disable_collisions, " +
+                         "disable_physics, terrain_texture_1, " +
+                         "terrain_texture_2, terrain_texture_3, " +
+                         "terrain_texture_4, elevation_1_nw, " +
+                         "elevation_2_nw, elevation_1_ne, " +
+                         "elevation_2_ne, elevation_1_se, " +
+                         "elevation_2_se, elevation_1_sw, " +
+                         "elevation_2_sw, water_height, " +
+                         "terrain_raise_limit, terrain_lower_limit, " +
+                         "use_estate_sun, fixed_sun, sun_position, " +
+                         "covenant, covenant_datetime, Sandbox, sunvectorx, sunvectory, " +
+                         "sunvectorz, loaded_creation_datetime, " +
+                         "loaded_creation_id, map_tile_ID, block_search, casino, " +
+                         "TelehubObject, parcel_tile_ID) " +
+                          "values (?RegionUUID, ?BlockTerraform, " +
+                         "?BlockFly, ?AllowDamage, ?RestrictPushing, " +
+                         "?AllowLandResell, ?AllowLandJoinDivide, " +
+                         "?BlockShowInSearch, ?AgentLimit, ?ObjectBonus, " +
+                         "?Maturity, ?DisableScripts, ?DisableCollisions, " +
+                         "?DisablePhysics, ?TerrainTexture1, " +
+                         "?TerrainTexture2, ?TerrainTexture3, " +
+                         "?TerrainTexture4, ?Elevation1NW, ?Elevation2NW, " +
+                         "?Elevation1NE, ?Elevation2NE, ?Elevation1SE, " +
+                         "?Elevation2SE, ?Elevation1SW, ?Elevation2SW, " +
+                         "?WaterHeight, ?TerrainRaiseLimit, " +
+                         "?TerrainLowerLimit, ?UseEstateSun, ?FixedSun, " +
+                         "?SunPosition, ?Covenant, ?CovenantChangedDateTime, ?Sandbox, " +
+                         "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
+                         "?LoadedCreationDateTime, ?LoadedCreationID, " +
+                         "?TerrainImageID, ?block_search, ?casino, " +
+                         "?TelehubObject, ?ParcelImageID)";
+
+                    FillRegionSettingsCommand(cmd, rs);
                     ExecuteNonQuery(cmd);
                 }
 
@@ -1567,34 +1568,6 @@ namespace OpenSim.Data.MySQL
         }
 
         /// <summary>
-        ///
-        /// </summary>
-        /// <param name="val"></param>
-        /// <returns></returns>
-        private static Array SerializeTerrain(double[,] val, double[,] oldTerrain)
-        {
-            MemoryStream str = new MemoryStream(((int)Constants.RegionSize * (int)Constants.RegionSize) *sizeof (double));
-            BinaryWriter bw = new BinaryWriter(str);
-
-            // TODO: COMPATIBILITY - Add byte-order conversions
-            for (int x = 0; x < (int)Constants.RegionSize; x++)
-                for (int y = 0; y < (int)Constants.RegionSize; y++)
-                {
-                    double height = 20.0;
-                    if (oldTerrain != null)
-                        height = oldTerrain[x, y];
-                    if (!double.IsNaN(val[x, y]))
-                        height = val[x, y];
-                    if (height == 0.0)
-                        height = double.Epsilon;
-
-                    bw.Write(height);
-                }
-
-            return str.ToArray();
-        }
-
-        /// <summary>
         /// Fill the prim command with prim values
         /// </summary>
         /// <param name="row"></param>