diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginResponse.cs | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index 18a4f02..c80ab7f 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs | |||
@@ -51,6 +51,7 @@ namespace OpenSim.Services.LLLoginService | |||
51 | string m_login; | 51 | string m_login; |
52 | 52 | ||
53 | public static LLFailedLoginResponse UserProblem; | 53 | public static LLFailedLoginResponse UserProblem; |
54 | public static LLFailedLoginResponse AuthorizationProblem; | ||
54 | public static LLFailedLoginResponse GridProblem; | 55 | public static LLFailedLoginResponse GridProblem; |
55 | public static LLFailedLoginResponse InventoryProblem; | 56 | public static LLFailedLoginResponse InventoryProblem; |
56 | public static LLFailedLoginResponse DeadRegionProblem; | 57 | public static LLFailedLoginResponse DeadRegionProblem; |
@@ -63,8 +64,11 @@ namespace OpenSim.Services.LLLoginService | |||
63 | UserProblem = new LLFailedLoginResponse("key", | 64 | UserProblem = new LLFailedLoginResponse("key", |
64 | "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.", | 65 | "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.", |
65 | "false"); | 66 | "false"); |
67 | AuthorizationProblem = new LLFailedLoginResponse("key", | ||
68 | "Error connecting to grid. Unable to authorize your session into the region.", | ||
69 | "false"); | ||
66 | GridProblem = new LLFailedLoginResponse("key", | 70 | GridProblem = new LLFailedLoginResponse("key", |
67 | "Error connecting to grid. Could not percieve credentials from login XML.", | 71 | "Error connecting to the desired location. Try connecting to another region.", |
68 | "false"); | 72 | "false"); |
69 | InventoryProblem = new LLFailedLoginResponse("key", | 73 | InventoryProblem = new LLFailedLoginResponse("key", |
70 | "The inventory service is not responding. Please notify your login region operator.", | 74 | "The inventory service is not responding. Please notify your login region operator.", |
@@ -288,8 +292,8 @@ namespace OpenSim.Services.LLLoginService | |||
288 | 292 | ||
289 | Home = string.Format( | 293 | Home = string.Format( |
290 | "{{'region_handle':[r{0},r{1}], 'position':[r{2},r{3},r{4}], 'look_at':[r{5},r{6},r{7}]}}", | 294 | "{{'region_handle':[r{0},r{1}], 'position':[r{2},r{3},r{4}], 'look_at':[r{5},r{6},r{7}]}}", |
291 | home.RegionLocX, | 295 | x, |
292 | home.RegionLocY, | 296 | y, |
293 | pinfo.HomePosition.X, pinfo.HomePosition.Y, pinfo.HomePosition.Z, | 297 | pinfo.HomePosition.X, pinfo.HomePosition.Y, pinfo.HomePosition.Z, |
294 | pinfo.HomeLookAt.X, pinfo.HomeLookAt.Y, pinfo.HomeLookAt.Z); | 298 | pinfo.HomeLookAt.X, pinfo.HomeLookAt.Y, pinfo.HomeLookAt.Z); |
295 | 299 | ||
@@ -441,8 +445,8 @@ namespace OpenSim.Services.LLLoginService | |||
441 | responseData["home"] = home; | 445 | responseData["home"] = home; |
442 | responseData["look_at"] = lookAt; | 446 | responseData["look_at"] = lookAt; |
443 | responseData["message"] = welcomeMessage; | 447 | responseData["message"] = welcomeMessage; |
444 | responseData["region_x"] = (Int32)(RegionX * Constants.RegionSize); | 448 | responseData["region_x"] = (Int32)(RegionX); |
445 | responseData["region_y"] = (Int32)(RegionY * Constants.RegionSize); | 449 | responseData["region_y"] = (Int32)(RegionY); |
446 | 450 | ||
447 | if (m_buddyList != null) | 451 | if (m_buddyList != null) |
448 | { | 452 | { |
@@ -537,8 +541,8 @@ namespace OpenSim.Services.LLLoginService | |||
537 | map["home"] = OSD.FromString(home); | 541 | map["home"] = OSD.FromString(home); |
538 | map["look_at"] = OSD.FromString(lookAt); | 542 | map["look_at"] = OSD.FromString(lookAt); |
539 | map["message"] = OSD.FromString(welcomeMessage); | 543 | map["message"] = OSD.FromString(welcomeMessage); |
540 | map["region_x"] = OSD.FromInteger(RegionX * Constants.RegionSize); | 544 | map["region_x"] = OSD.FromInteger(RegionX); |
541 | map["region_y"] = OSD.FromInteger(RegionY * Constants.RegionSize); | 545 | map["region_y"] = OSD.FromInteger(RegionY); |
542 | 546 | ||
543 | if (m_buddyList != null) | 547 | if (m_buddyList != null) |
544 | { | 548 | { |