diff options
| author | Melanie | 2010-02-14 22:27:39 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-14 22:27:39 +0000 |
| commit | 2084e08ad7a24908a4465108f2b76ee639c91ae6 (patch) | |
| tree | 1cc1aa8f1c08de402f27036762b9ac2d1eccabfe /OpenSim/Region/ScriptEngine/Shared/Instance | |
| parent | Resolve a merge issue (diff) | |
| parent | * SQLite match code casing with regionsettings table field casing (what's wit... (diff) | |
| download | opensim-SC_OLD-2084e08ad7a24908a4465108f2b76ee639c91ae6.zip opensim-SC_OLD-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.gz opensim-SC_OLD-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.bz2 opensim-SC_OLD-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs index bf3d335..bcdc7bf 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs | |||
| @@ -389,7 +389,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 389 | break; | 389 | break; |
| 390 | case "MinEventDelay": | 390 | case "MinEventDelay": |
| 391 | double minEventDelay = 0.0; | 391 | double minEventDelay = 0.0; |
| 392 | double.TryParse(part.InnerText, out minEventDelay); | 392 | double.TryParse(part.InnerText, NumberStyles.Float, Culture.NumberFormatInfo, out minEventDelay); |
| 393 | instance.MinEventDelay = minEventDelay; | 393 | instance.MinEventDelay = minEventDelay; |
| 394 | break; | 394 | break; |
| 395 | } | 395 | } |