diff options
Diffstat (limited to 'OpenSim/Framework/Communications/Services')
-rw-r--r-- | OpenSim/Framework/Communications/Services/LoginResponse.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/Services/LoginService.cs | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Services/LoginResponse.cs b/OpenSim/Framework/Communications/Services/LoginResponse.cs index d91bf84..4b5c99d 100644 --- a/OpenSim/Framework/Communications/Services/LoginResponse.cs +++ b/OpenSim/Framework/Communications/Services/LoginResponse.cs | |||
@@ -320,7 +320,7 @@ namespace OpenSim.Framework.Communications.Services | |||
320 | { | 320 | { |
321 | return GenerateFailureResponseLLSD( | 321 | return GenerateFailureResponseLLSD( |
322 | "key", | 322 | "key", |
323 | "Error connecting to grid. Could not percieve credentials from login XML.", | 323 | "Error connecting to grid. Could not perceive credentials from login XML.", |
324 | "false"); | 324 | "false"); |
325 | } | 325 | } |
326 | 326 | ||
diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs index 168f7a6..f55c030 100644 --- a/OpenSim/Framework/Communications/Services/LoginService.cs +++ b/OpenSim/Framework/Communications/Services/LoginService.cs | |||
@@ -946,13 +946,15 @@ namespace OpenSim.Framework.Communications.Services | |||
946 | { | 946 | { |
947 | regionInfo = homeInfo; | 947 | regionInfo = homeInfo; |
948 | theUser.CurrentAgent.Position = theUser.HomeLocation; | 948 | theUser.CurrentAgent.Position = theUser.HomeLocation; |
949 | response.LookAt = "[r" + theUser.HomeLookAt.X.ToString() + ",r" + theUser.HomeLookAt.Y.ToString() + ",r" + theUser.HomeLookAt.Z.ToString() + "]"; | 949 | response.LookAt = String.Format("[r{0},r{1},r{2}]", theUser.HomeLookAt.X.ToString(), |
950 | theUser.HomeLookAt.Y.ToString(), theUser.HomeLookAt.Z.ToString()); | ||
950 | } | 951 | } |
951 | else if (startLocationRequest == "last") | 952 | else if (startLocationRequest == "last") |
952 | { | 953 | { |
953 | UUID lastRegion = theUser.CurrentAgent.Region; | 954 | UUID lastRegion = theUser.CurrentAgent.Region; |
954 | regionInfo = GetRegionInfo(lastRegion); | 955 | regionInfo = GetRegionInfo(lastRegion); |
955 | response.LookAt = "[r" + theUser.CurrentAgent.LookAt.X.ToString() + ",r" + theUser.CurrentAgent.LookAt.Y.ToString() + ",r" + theUser.CurrentAgent.LookAt.Z.ToString() + "]"; | 956 | response.LookAt = String.Format("[r{0},r{1},r{2}]", theUser.CurrentAgent.LookAt.X.ToString(), |
957 | theUser.CurrentAgent.LookAt.Y.ToString(), theUser.CurrentAgent.LookAt.Z.ToString()); | ||
956 | } | 958 | } |
957 | else | 959 | else |
958 | { | 960 | { |