diff options
| author | Melanie | 2010-02-15 00:20:48 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-15 00:20:48 +0000 |
| commit | c033223c63274ebe41075b24d108ca952fbd242c (patch) | |
| tree | 8c969a9643c469feb37133b175be18eb52fdff49 /OpenSim/Region/ScriptEngine/Shared/Instance | |
| parent | Extraneous debug messages removed (diff) | |
| parent | Plug a small hole (diff) | |
| download | opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.zip opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.tar.gz opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.tar.bz2 opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.tar.xz | |
Merge branch 'master' into presence-refactor
Diffstat (limited to '')
| -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 | } |