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/ConfigurationMember.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 '')
-rw-r--r-- | OpenSim/Framework/ConfigurationMember.cs | 6 |
1 files changed, 3 insertions, 3 deletions
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 | |||
420 | case ConfigurationOption.ConfigurationTypes.TYPE_FLOAT: | 420 | case ConfigurationOption.ConfigurationTypes.TYPE_FLOAT: |
421 | float floatResult; | 421 | float floatResult; |
422 | if ( | 422 | if ( |
423 | float.TryParse(console_result, NumberStyles.AllowDecimalPoint, Culture.NumberFormatInfo, | 423 | float.TryParse(console_result, NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign, Culture.NumberFormatInfo, |
424 | out floatResult)) | 424 | out floatResult)) |
425 | { | 425 | { |
426 | convertSuccess = true; | 426 | convertSuccess = true; |
@@ -431,7 +431,7 @@ namespace OpenSim.Framework | |||
431 | case ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE: | 431 | case ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE: |
432 | double doubleResult; | 432 | double doubleResult; |
433 | if ( | 433 | if ( |
434 | Double.TryParse(console_result, NumberStyles.AllowDecimalPoint, Culture.NumberFormatInfo, | 434 | Double.TryParse(console_result, NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign, Culture.NumberFormatInfo, |
435 | out doubleResult)) | 435 | out doubleResult)) |
436 | { | 436 | { |
437 | convertSuccess = true; | 437 | convertSuccess = true; |
@@ -519,4 +519,4 @@ namespace OpenSim.Framework | |||
519 | configurationPlugin.Close(); | 519 | configurationPlugin.Close(); |
520 | } | 520 | } |
521 | } | 521 | } |
522 | } \ No newline at end of file | 522 | } |