aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/LLLoginService/LLLoginService.cs
diff options
context:
space:
mode:
authorMelanie2010-04-27 00:27:05 +0100
committerMelanie2010-04-27 00:27:05 +0100
commitbbffe16f138a7a11e43cd403df07ed8aa934fab3 (patch)
treed9de049741233cd4fe8c8d6675acc31c483fa845 /OpenSim/Services/LLLoginService/LLLoginService.cs
parentAdd a parameter to prim inventory update to prevent event firing (diff)
parentAdd a parameter to prim inventory update to prevent event firing (diff)
downloadopensim-SC_OLD-bbffe16f138a7a11e43cd403df07ed8aa934fab3.zip
opensim-SC_OLD-bbffe16f138a7a11e43cd403df07ed8aa934fab3.tar.gz
opensim-SC_OLD-bbffe16f138a7a11e43cd403df07ed8aa934fab3.tar.bz2
opensim-SC_OLD-bbffe16f138a7a11e43cd403df07ed8aa934fab3.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/LLLoginService/LLLoginService.cs')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs6
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)