From 838ffd779280115dee2d24ddd9531728d7426942 Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Thu, 19 Jun 2008 20:57:00 +0000
Subject: Mantis#1543. Thank you kindly, Jonc for a patch that: Implements
 terrain bake from Region/Estate dialog and respects estate settings during
 terraforming

---
 OpenSim/Framework/ConfigurationMember.cs | 6 +++---
 OpenSim/Framework/EstateSettings.cs      | 6 +++---
 OpenSim/Framework/IClientAPI.cs          | 4 +++-
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
index cb434f0..c363ec0 100644
--- a/OpenSim/Framework/ConfigurationMember.cs
+++ b/OpenSim/Framework/ConfigurationMember.cs
@@ -420,7 +420,7 @@ namespace OpenSim.Framework
                         case ConfigurationOption.ConfigurationTypes.TYPE_FLOAT:
                             float floatResult;
                             if (
-                                float.TryParse(console_result, NumberStyles.AllowDecimalPoint, Culture.NumberFormatInfo,
+                                float.TryParse(console_result, NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign, Culture.NumberFormatInfo,
                                                out floatResult))
                             {
                                 convertSuccess = true;
@@ -431,7 +431,7 @@ namespace OpenSim.Framework
                         case ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE:
                             double doubleResult;
                             if (
-                                Double.TryParse(console_result, NumberStyles.AllowDecimalPoint, Culture.NumberFormatInfo,
+                                Double.TryParse(console_result, NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign, Culture.NumberFormatInfo,
                                                 out doubleResult))
                             {
                                 convertSuccess = true;
@@ -519,4 +519,4 @@ namespace OpenSim.Framework
             configurationPlugin.Close();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index d0e56ab..997caad 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -773,9 +773,9 @@ namespace OpenSim.Framework
             configMember.addConfigurationOption("sun_hour", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "0",
                                                 true);
             configMember.addConfigurationOption("terrain_raise_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
-                                                String.Empty, "0", true);
+                                                String.Empty, "4.0", true); //4 is the LL default
             configMember.addConfigurationOption("terrain_lower_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
-                                                String.Empty, "0", true);
+                                                String.Empty, "-4.0", true); //-4.0 is the LL default
             configMember.addConfigurationOption("use_fixed_sun", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, String.Empty,
                                                 "false", true);
             configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
@@ -1013,4 +1013,4 @@ namespace OpenSim.Framework
             return true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index fafd31d..e4fac1f 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -410,7 +410,7 @@ namespace OpenSim.Framework
     public delegate void ModifyTerrain(
         float height, float seconds, byte size, byte action, float north, float west, float south, float east,
         IClientAPI remoteClient);
-
+    
     public delegate void SetAppearance(byte[] texture, List<byte> visualParamList);
 
     public delegate void StartAnim(IClientAPI remoteClient, LLUUID animID);
@@ -633,6 +633,7 @@ namespace OpenSim.Framework
     public delegate void SetEstateTerrainTextureHeights(IClientAPI remoteClient, int corner, float lowVal, float highVal);
     public delegate void CommitEstateTerrainTextureRequest(IClientAPI remoteClient);
     public delegate void SetRegionTerrainSettings(float waterHeight, float terrainRaiseLimit, float terrainLowerLimit, bool fixedSun, float sunHour);
+    public delegate void BakeTerrain(IClientAPI remoteClient );
     public delegate void EstateRestartSimRequest(IClientAPI remoteClient, int secondsTilReboot);
     public delegate void EstateChangeCovenantRequest(IClientAPI remoteClient, LLUUID newCovenantID);
     public delegate void UpdateEstateAccessDeltaRequest(IClientAPI remote_client, LLUUID invoice, int estateAccessType, LLUUID user);
@@ -693,6 +694,7 @@ namespace OpenSim.Framework
         event RezObject OnRezObject;
         [Obsolete("LLClientView Specific - Replace with more suitable arguments.")]
         event ModifyTerrain OnModifyTerrain;
+        event BakeTerrain OnBakeTerrain;
         [Obsolete("LLClientView Specific.")]
         event SetAppearance OnSetAppearance;
         [Obsolete("LLClientView Specific - Replace and rename OnAvatarUpdate. Difference from SetAppearance?")]
-- 
cgit v1.1