mirror of
https://github.com/opensim/opensim.git
synced 2026-08-09 02:36:00 +08:00
* Check in login service tests beachhead
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -2860,7 +2860,6 @@ namespace OpenSim.Region.Environment.Scenes
|
||||
if (RegionInfo.EstateSettings.IsBanned(agentId))
|
||||
return;
|
||||
|
||||
|
||||
String capsObjectPath = GetCapsPath(agentId);
|
||||
|
||||
m_log.DebugFormat(
|
||||
|
||||
Reference in New Issue
Block a user