* Check in login service tests beachhead

This commit is contained in:
Justin Clarke Casey
2009-01-05 16:30:35 +00:00
parent d8a2ad5cb5
commit 0b8d22ab54
5 changed files with 17 additions and 12 deletions

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;

View File

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