mirror of
https://github.com/opensim/opensim.git
synced 2026-08-08 18:25:33 +08:00
* Tleiades grid mode inventory (#444) - thanx Tleiades!
* updated to rev 1413 on libsecondlife.dll and libsecondlife.dll.config (#423)
This commit is contained in:
@@ -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");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user