mirror of
https://github.com/opensim/opensim.git
synced 2026-08-12 20:55:43 +08:00
Reverting back to 2017 since 2018 were causing Linux breakage; reopening Tleiades patch 444 and 445.
This commit is contained in:
@@ -6,7 +6,6 @@ using OpenSim.Framework.Data;
|
||||
using OpenSim.Framework.UserManagement;
|
||||
using OpenSim.Framework.Utilities;
|
||||
using OpenSim.Framework.Configuration;
|
||||
using OpenSim.Framework.Communications;
|
||||
|
||||
namespace OpenSim.Grid.UserServer
|
||||
{
|
||||
@@ -14,8 +13,8 @@ namespace OpenSim.Grid.UserServer
|
||||
{
|
||||
public UserConfig m_config;
|
||||
|
||||
public UserLoginService(UserManagerBase userManager, IInventoryServices inventoryServer, UserConfig config, string welcomeMess)
|
||||
: base(userManager, inventoryServer, welcomeMess)
|
||||
public UserLoginService(UserManagerBase userManager, UserConfig config, string welcomeMess)
|
||||
: base(userManager, welcomeMess)
|
||||
{
|
||||
m_config = config;
|
||||
}
|
||||
@@ -72,29 +71,25 @@ namespace OpenSim.Grid.UserServer
|
||||
theUser.currentAgent.currentHandle = SimInfo.regionHandle;
|
||||
|
||||
System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI);
|
||||
// Send
|
||||
try
|
||||
{
|
||||
XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
|
||||
XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);
|
||||
// Send
|
||||
try
|
||||
{
|
||||
XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
|
||||
XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);
|
||||
}
|
||||
catch( WebException e )
|
||||
{
|
||||
switch( e.Status )
|
||||
{
|
||||
case WebExceptionStatus.Timeout:
|
||||
//TODO: Send him to nearby or default region instead
|
||||
break;
|
||||
|
||||
default:
|
||||
throw;
|
||||
}
|
||||
{
|
||||
switch( e.Status )
|
||||
{
|
||||
case WebExceptionStatus.Timeout:
|
||||
//TODO: Send him to nearby or default region instead
|
||||
break;
|
||||
|
||||
default:
|
||||
throw;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user