Merge branch 'master' into careminster

This commit is contained in:
Melanie
2010-02-14 22:27:39 +00:00
34 changed files with 357 additions and 400 deletions

View File

@@ -218,9 +218,9 @@ namespace OpenSim.Client.Linden
{
//m_log.Debug("[CLIENT]: Main agent detected");
agentData.startpos =
new Vector3((float)Convert.ToDecimal((string)requestData["startpos_x"]),
(float)Convert.ToDecimal((string)requestData["startpos_y"]),
(float)Convert.ToDecimal((string)requestData["startpos_z"]));
new Vector3((float)Convert.ToDecimal((string)requestData["startpos_x"], Culture.NumberFormatInfo),
(float)Convert.ToDecimal((string)requestData["startpos_y"], Culture.NumberFormatInfo),
(float)Convert.ToDecimal((string)requestData["startpos_z"], Culture.NumberFormatInfo));
agentData.child = false;
}