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

* Check in login service tests beachhead

0.6.2-post-fixes
Justin Clarke Casey 2009-01-05 16:30:35 +00:00
parent d8a2ad5cb5
commit 0b8d22ab54
5 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Framework/Communications/LoginService.cs
View File

@ -160,7 +160,7 @@ namespace OpenSim.Framework.Communications
else
{
m_log.Info(
"[LOGIN END]: XMLRPC login_to_simulator login message did not contain all the required data");
"[LOGIN END]: XMLRPC login_to_simulator login message did not contain all the required data");
return logResponse.CreateGridErrorResponse();
}
@ -259,25 +259,25 @@ namespace OpenSim.Framework.Communications
StatsManager.UserStats.AddSuccessfulLogin();
m_log.DebugFormat(
"[LOGIN END]: XMLRPC Authentication of user {0} {1} successful. Sending response to client.",
"[LOGIN END]: XMLRPC Authentication of user {0} {1} successful. Sending response to client.",
firstname, lastname);
return logResponse.ToXmlRpcResponse();
}
else
{
m_log.ErrorFormat("[LOGIN END]: XMLRPC informing user {0} {1} that login failed due to an unavailable region", firstname, lastname);
m_log.ErrorFormat("[LOGIN END]: XMLRPC informing user {0} {1} that login failed due to an unavailable region", firstname, lastname);
return logResponse.CreateDeadRegionResponse();
}
}
catch (Exception e)
{
m_log.Error("[LOGIN END]: XMLRPC Login failed, " + e);
m_log.Error("[LOGIN END]: XMLRPC Login failed, " + e);
m_log.Error(e.StackTrace);
}
}
m_log.Info("[LOGIN END]: XMLRPC Login failed. Sending back blank XMLRPC response");
m_log.Info("[LOGIN END]: XMLRPC Login failed. Sending back blank XMLRPC response");
return response;
}
finally
@ -329,7 +329,7 @@ namespace OpenSim.Framework.Communications
userProfile = GetTheUser(firstname, lastname);
if (userProfile == null)
{
m_log.Info("[LOGIN]: LLSD Could not find a profile for " + firstname + " " + lastname);
m_log.Info("[LOGIN]: LLSD Could not find a profile for " + firstname + " " + lastname);
return false;
}

1
OpenSim/Grid/UserServer/UserLoginService.cs
View File

@ -316,6 +316,7 @@ namespace OpenSim.Grid.UserServer
m_log.InfoFormat(
"[LOGIN]: Telling {0} @ {1},{2} ({3}) to prepare for client connection",
regionInfo.regionName, response.RegionX, response.RegionY, regionInfo.httpServerURI);
// Update agent with target sim
user.CurrentAgent.Region = regionInfo.UUID;
user.CurrentAgent.Handle = regionInfo.regionHandle;

6
OpenSim/Region/Communications/Local/LocalLoginService.cs
View File

@ -219,7 +219,7 @@ namespace OpenSim.Region.Communications.Local
if ((regionInfo != null) && (PrepareLoginToRegion(regionInfo, theUser, response)))
{
return true;
return true;
}
// StartLocation not available, send him to a nearby region instead
@ -303,11 +303,9 @@ namespace OpenSim.Region.Communications.Local
string seedcap = "http://";
if (serversInfo.HttpUsesSSL)
{
seedcap = "https://" + serversInfo.HttpSSLCN + ":" + serversInfo.httpSSLPort + "/CAPS/" + capsPath + "0000/";
}
else
{
@ -320,9 +318,11 @@ namespace OpenSim.Region.Communications.Local
m_log.InfoFormat(
"[LOGIN]: Telling {0} @ {1},{2} ({3}) to prepare for client connection",
regionInfo.RegionName, response.RegionX, response.RegionY, regionInfo.ServerURI);
// Update agent with target sim
user.CurrentAgent.Region = regionInfo.RegionID;
user.CurrentAgent.Handle = regionInfo.RegionHandle;
// Prepare notification
Login loginParams = new Login();
loginParams.Session = user.CurrentAgent.SessionID;

1
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -2860,7 +2860,6 @@ namespace OpenSim.Region.Environment.Scenes
if (RegionInfo.EstateSettings.IsBanned(agentId))
return;
String capsObjectPath = GetCapsPath(agentId);
m_log.DebugFormat(

9
OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
View File

@ -36,7 +36,12 @@ namespace OpenSim.Tests.Common.Mock
public class TestCommunicationsManager : CommunicationsManager
{
public TestCommunicationsManager()
: base(null, null, null, false, null)
: this(null)
{
}
public TestCommunicationsManager(NetworkServersInfo serversInfo)
: base(serversInfo, null, null, false, null)
{
LocalInventoryService lis = new LocalInventoryService();
m_interServiceInventoryService = lis;
@ -44,7 +49,7 @@ namespace OpenSim.Tests.Common.Mock
LocalUserServices lus = new LocalUserServices(991, 992, lis);
m_userService = lus;
m_userAdminService = lus;
m_userAdminService = lus;
}
}
}