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/Client | |
| parent | Resolve a merge issue (diff) | |
| parent | * SQLite match code casing with regionsettings table field casing (what's wit... (diff) | |
| download | opensim-SC_OLD-2084e08ad7a24908a4465108f2b76ee639c91ae6.zip opensim-SC_OLD-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.gz opensim-SC_OLD-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.bz2 opensim-SC_OLD-2084e08ad7a24908a4465108f2b76ee639c91ae6.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Client')
| -rw-r--r-- | OpenSim/Client/Linden/LLProxyLoginModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Client/Linden/LLProxyLoginModule.cs b/OpenSim/Client/Linden/LLProxyLoginModule.cs index 14ce682..7c36a9b 100644 --- a/OpenSim/Client/Linden/LLProxyLoginModule.cs +++ b/OpenSim/Client/Linden/LLProxyLoginModule.cs | |||
| @@ -218,9 +218,9 @@ namespace OpenSim.Client.Linden | |||
| 218 | { | 218 | { |
| 219 | //m_log.Debug("[CLIENT]: Main agent detected"); | 219 | //m_log.Debug("[CLIENT]: Main agent detected"); |
| 220 | agentData.startpos = | 220 | agentData.startpos = |
| 221 | new Vector3((float)Convert.ToDecimal((string)requestData["startpos_x"]), | 221 | new Vector3((float)Convert.ToDecimal((string)requestData["startpos_x"], Culture.NumberFormatInfo), |
| 222 | (float)Convert.ToDecimal((string)requestData["startpos_y"]), | 222 | (float)Convert.ToDecimal((string)requestData["startpos_y"], Culture.NumberFormatInfo), |
| 223 | (float)Convert.ToDecimal((string)requestData["startpos_z"])); | 223 | (float)Convert.ToDecimal((string)requestData["startpos_z"], Culture.NumberFormatInfo)); |
| 224 | agentData.child = false; | 224 | agentData.child = false; |
| 225 | } | 225 | } |
| 226 | 226 | ||