diff options
| author | UbitUmarov | 2017-07-20 11:30:12 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-07-20 11:30:12 +0100 |
| commit | fe6ad384e43c11c3bf6268f5ab6fe3ea37c74540 (patch) | |
| tree | 44ae3d8b00f3d2f6bf78bc0226a779f99ed6dc48 /OpenSim/Capabilities | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | fix object updates throttle for scripts doing motion by direct change of posi... (diff) | |
| download | opensim-SC-fe6ad384e43c11c3bf6268f5ab6fe3ea37c74540.zip opensim-SC-fe6ad384e43c11c3bf6268f5ab6fe3ea37c74540.tar.gz opensim-SC-fe6ad384e43c11c3bf6268f5ab6fe3ea37c74540.tar.bz2 opensim-SC-fe6ad384e43c11c3bf6268f5ab6fe3ea37c74540.tar.xz | |
merge
Diffstat (limited to 'OpenSim/Capabilities')
| -rw-r--r-- | OpenSim/Capabilities/LLSD.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/LLSD.cs b/OpenSim/Capabilities/LLSD.cs index c59cede..76e439f 100644 --- a/OpenSim/Capabilities/LLSD.cs +++ b/OpenSim/Capabilities/LLSD.cs | |||
| @@ -566,7 +566,7 @@ namespace OpenSim.Framework.Capabilities | |||
| 566 | endPos = FindEnd(llsd, 1); | 566 | endPos = FindEnd(llsd, 1); |
| 567 | 567 | ||
| 568 | if (Double.TryParse(llsd.Substring(1, endPos - 1), NumberStyles.Float, | 568 | if (Double.TryParse(llsd.Substring(1, endPos - 1), NumberStyles.Float, |
| 569 | Utils.EnUsCulture.NumberFormat, out value)) | 569 | Culture.NumberFormatInfo, out value)) |
| 570 | return value; | 570 | return value; |
| 571 | else | 571 | else |
| 572 | throw new LLSDParseException("Failed to parse double value type"); | 572 | throw new LLSDParseException("Failed to parse double value type"); |