Reverting back to 2017 since 2018 were causing Linux breakage; reopening Tleiades patch 444 and 445.

This commit is contained in:
lbsa71
2007-09-27 14:57:43 +00:00
parent a6f3fa2fbe
commit 863195612b
37 changed files with 424 additions and 1154 deletions

View File

@@ -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;
}
}
}
}
}