diff options
| author | Melanie | 2010-02-14 22:27:39 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-14 22:27:39 +0000 |
| commit | 2084e08ad7a24908a4465108f2b76ee639c91ae6 (patch) | |
| tree | 1cc1aa8f1c08de402f27036762b9ac2d1eccabfe /OpenSim/Region/Application | |
| parent | Resolve a merge issue (diff) | |
| parent | * SQLite match code casing with regionsettings table field casing (what's wit... (diff) | |
| download | opensim-SC-2084e08ad7a24908a4465108f2b76ee639c91ae6.zip opensim-SC-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.gz opensim-SC-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.bz2 opensim-SC-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to '')
| -rwxr-xr-x | OpenSim/Region/Application/OpenSim.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index eccd276..a86a831 100755 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
| @@ -1183,14 +1183,14 @@ namespace OpenSim | |||
| 1183 | } | 1183 | } |
| 1184 | if (cmdparams.Length > 4) | 1184 | if (cmdparams.Length > 4) |
| 1185 | { | 1185 | { |
| 1186 | loadOffset.X = (float) Convert.ToDecimal(cmdparams[4]); | 1186 | loadOffset.X = (float)Convert.ToDecimal(cmdparams[4], Culture.NumberFormatInfo); |
| 1187 | if (cmdparams.Length > 5) | 1187 | if (cmdparams.Length > 5) |
| 1188 | { | 1188 | { |
| 1189 | loadOffset.Y = (float) Convert.ToDecimal(cmdparams[5]); | 1189 | loadOffset.Y = (float)Convert.ToDecimal(cmdparams[5], Culture.NumberFormatInfo); |
| 1190 | } | 1190 | } |
| 1191 | if (cmdparams.Length > 6) | 1191 | if (cmdparams.Length > 6) |
| 1192 | { | 1192 | { |
| 1193 | loadOffset.Z = (float) Convert.ToDecimal(cmdparams[6]); | 1193 | loadOffset.Z = (float)Convert.ToDecimal(cmdparams[6], Culture.NumberFormatInfo); |
| 1194 | } | 1194 | } |
| 1195 | MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); | 1195 | MainConsole.Instance.Output(String.Format("loadOffsets <X,Y,Z> = <{0},{1},{2}>",loadOffset.X,loadOffset.Y,loadOffset.Z)); |
| 1196 | } | 1196 | } |