OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

avinationmerge
Melanie 2010-08-09 00:49:15 +01:00
parent 321e1148da bc7ee7ba88
commit 52f49b2a78
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Services/LLLoginService/LLLoginResponse.cs
View File

@ -52,7 +52,6 @@ namespace OpenSim.Services.LLLoginService
protected string m_login;
public static LLFailedLoginResponse UserProblem;
public static LLFailedLoginResponse AuthorizationProblem;
public static LLFailedLoginResponse GridProblem;
public static LLFailedLoginResponse InventoryProblem;
public static LLFailedLoginResponse DeadRegionProblem;
@ -66,9 +65,6 @@ namespace OpenSim.Services.LLLoginService
UserProblem = new LLFailedLoginResponse("key",
"Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.",
"false");
AuthorizationProblem = new LLFailedLoginResponse("key",
"Error connecting to grid. Unable to authorize your session into the region.",
"false");
GridProblem = new LLFailedLoginResponse("key",
"Error connecting to the desired location. Try connecting to another region.",
"false");

2
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@ -351,7 +351,7 @@ namespace OpenSim.Services.LLLoginService
{
m_PresenceService.LogoutAgent(session);
m_log.InfoFormat("[LLOGIN SERVICE]: Login failed, reason: {0}", reason);
return LLFailedLoginResponse.AuthorizationProblem;
return new LLFailedLoginResponse("key", reason, "false");
}
// Get Friends list