diff options
| author | John Hurliman | 2010-04-22 18:56:06 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-04-22 18:56:06 -0700 |
| commit | 8692ac53f56c8db9942021709e7415b2b2add0c6 (patch) | |
| tree | 5681611d23f8f89b38d2c19ef032d412fd3fe3d2 /OpenSim/Services | |
| parent | * Better error logging for failed SimianGrid web service calls (diff) | |
| parent | Insert a ROLLBACK command on migration step failure. This ensures that (diff) | |
| download | opensim-SC-8692ac53f56c8db9942021709e7415b2b2add0c6.zip opensim-SC-8692ac53f56c8db9942021709e7415b2b2add0c6.tar.gz opensim-SC-8692ac53f56c8db9942021709e7415b2b2add0c6.tar.bz2 opensim-SC-8692ac53f56c8db9942021709e7415b2b2add0c6.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 7b25274..c333b5c 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
| @@ -405,9 +405,9 @@ namespace OpenSim.Services.LLLoginService | |||
| 405 | } | 405 | } |
| 406 | else | 406 | else |
| 407 | { | 407 | { |
| 408 | position = new Vector3(float.Parse(uriMatch.Groups["x"].Value), | 408 | position = new Vector3(float.Parse(uriMatch.Groups["x"].Value, Culture.NumberFormatInfo), |
| 409 | float.Parse(uriMatch.Groups["y"].Value), | 409 | float.Parse(uriMatch.Groups["y"].Value, Culture.NumberFormatInfo), |
| 410 | float.Parse(uriMatch.Groups["z"].Value)); | 410 | float.Parse(uriMatch.Groups["z"].Value, Culture.NumberFormatInfo)); |
| 411 | 411 | ||
| 412 | string regionName = uriMatch.Groups["region"].ToString(); | 412 | string regionName = uriMatch.Groups["region"].ToString(); |
| 413 | if (regionName != null) | 413 | if (regionName != null) |