diff options
author | Charles Krinke | 2008-06-19 20:57:00 +0000 |
---|---|---|
committer | Charles Krinke | 2008-06-19 20:57:00 +0000 |
commit | 838ffd779280115dee2d24ddd9531728d7426942 (patch) | |
tree | 753ce7e8d03e83898cf07cac2c85ca8a382b0a67 /OpenSim/Framework/EstateSettings.cs | |
parent | * Patch from Dahlia - 0001576: Exception of type 'System.OutOfMemoryException... (diff) | |
download | opensim-SC_OLD-838ffd779280115dee2d24ddd9531728d7426942.zip opensim-SC_OLD-838ffd779280115dee2d24ddd9531728d7426942.tar.gz opensim-SC_OLD-838ffd779280115dee2d24ddd9531728d7426942.tar.bz2 opensim-SC_OLD-838ffd779280115dee2d24ddd9531728d7426942.tar.xz |
Mantis#1543. Thank you kindly, Jonc for a patch that:
Implements terrain bake from Region/Estate dialog and
respects estate settings during terraforming
Diffstat (limited to 'OpenSim/Framework/EstateSettings.cs')
-rw-r--r-- | OpenSim/Framework/EstateSettings.cs | 6 |
1 files changed, 3 insertions, 3 deletions
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 | |||
773 | configMember.addConfigurationOption("sun_hour", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "0", | 773 | configMember.addConfigurationOption("sun_hour", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, "0", |
774 | true); | 774 | true); |
775 | configMember.addConfigurationOption("terrain_raise_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, | 775 | configMember.addConfigurationOption("terrain_raise_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, |
776 | String.Empty, "0", true); | 776 | String.Empty, "4.0", true); //4 is the LL default |
777 | configMember.addConfigurationOption("terrain_lower_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, | 777 | configMember.addConfigurationOption("terrain_lower_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, |
778 | String.Empty, "0", true); | 778 | String.Empty, "-4.0", true); //-4.0 is the LL default |
779 | configMember.addConfigurationOption("use_fixed_sun", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, String.Empty, | 779 | configMember.addConfigurationOption("use_fixed_sun", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, String.Empty, |
780 | "false", true); | 780 | "false", true); |
781 | configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, | 781 | configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, |
@@ -1013,4 +1013,4 @@ namespace OpenSim.Framework | |||
1013 | return true; | 1013 | return true; |
1014 | } | 1014 | } |
1015 | } | 1015 | } |
1016 | } \ No newline at end of file | 1016 | } |