aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorMelanie2010-02-15 00:20:48 +0000
committerMelanie2010-02-15 00:20:48 +0000
commitc033223c63274ebe41075b24d108ca952fbd242c (patch)
tree8c969a9643c469feb37133b175be18eb52fdff49 /OpenSim/Region/Application
parentExtraneous debug messages removed (diff)
parentPlug a small hole (diff)
downloadopensim-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 'OpenSim/Region/Application')
-rwxr-xr-xOpenSim/Region/Application/OpenSim.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 693aedc..acd6a14 100755
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -1055,14 +1055,14 @@ namespace OpenSim
1055 } 1055 }
1056 if (cmdparams.Length > 4) 1056 if (cmdparams.Length > 4)
1057 { 1057 {
1058 loadOffset.X = (float) Convert.ToDecimal(cmdparams[4]); 1058 loadOffset.X = (float)Convert.ToDecimal(cmdparams[4], Culture.NumberFormatInfo);
1059 if (cmdparams.Length > 5) 1059 if (cmdparams.Length > 5)
1060 { 1060 {
1061 loadOffset.Y = (float) Convert.ToDecimal(cmdparams[5]); 1061 loadOffset.Y = (float)Convert.ToDecimal(cmdparams[5], Culture.NumberFormatInfo);
1062 } 1062 }
1063 if (cmdparams.Length > 6) 1063 if (cmdparams.Length > 6)
1064 { 1064 {
1065 loadOffset.Z = (float) Convert.ToDecimal(cmdparams[6]); 1065 loadOffset.Z = (float)Convert.ToDecimal(cmdparams[6], Culture.NumberFormatInfo);
1066 } 1066 }
1067 MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); 1067 MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z));
1068 } 1068 }