ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Tleiades grid mode inventory (#444) - thanx Tleiades!

Browse Source 
* updated to rev 1413 on libsecondlife.dll and libsecondlife.dll.config (#423)
This commit is contained in:
lbsa71
2007-09-27 13:25:45 +00:00
parent 569ba9eb9a
commit 8143c597fc
37 changed files with 1040 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Grid/UserServer/Main.cs
View File

@@ -36,6 +36,8 @@ using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Utilities;
using OpenSim.Framework.Configuration;
using OpenSim.Framework.Communications;
using OpenSim.Region.Communications.OGS1;
namespace OpenSim.Grid.UserServer
{
@@ -48,6 +50,8 @@ namespace OpenSim.Grid.UserServer
public UserManager m_userManager;
public UserLoginService m_loginService;
public IInventoryServices m_inventoryService;
LogBase m_console;
[STAThread]
@@ -90,7 +94,11 @@ namespace OpenSim.Grid.UserServer
m_userManager._config = Cfg;
m_userManager.AddPlugin(Cfg.DatabaseProvider);
m_loginService = new UserLoginService(m_userManager, Cfg, Cfg.DefaultStartupMsg);
// prepare connection to the inventory server
m_inventoryService = new OGS1InventoryService(Cfg.InventoryServerName, Cfg.InventoryServerPort, null);
m_loginService = new UserLoginService(m_userManager, m_inventoryService, Cfg, Cfg.DefaultStartupMsg);
MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process");
BaseHttpServer httpServer = new BaseHttpServer((int)Cfg.HttpPort);
@@ -103,6 +111,7 @@ namespace OpenSim.Grid.UserServer
httpServer.AddStreamHandler( new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod ));
httpServer.Start();
m_console.Status("SERVER", "Userserver 0.3 - Startup complete");
}

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

@@ -6,6 +6,7 @@ using OpenSim.Framework.Data;
using OpenSim.Framework.UserManagement;
using OpenSim.Framework.Utilities;
using OpenSim.Framework.Configuration;
using OpenSim.Framework.Communications;
namespace OpenSim.Grid.UserServer
{
@@ -13,8 +14,8 @@ namespace OpenSim.Grid.UserServer
{
public UserConfig m_config;
public UserLoginService(UserManagerBase userManager, UserConfig config, string welcomeMess)
: base(userManager, welcomeMess)
public UserLoginService(UserManagerBase userManager, IInventoryServices inventoryServer, UserConfig config, string welcomeMess)
: base(userManager, inventoryServer, welcomeMess)
{
m_config = config;
}
@@ -71,25 +72,29 @@ 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;
}
}
}
}
}