diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index 28635dd..c2822b6 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -36,8 +36,6 @@ using OpenSim.Framework.Interfaces; | |||
36 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
37 | using OpenSim.Framework.Utilities; | 37 | using OpenSim.Framework.Utilities; |
38 | using OpenSim.Framework.Configuration; | 38 | using OpenSim.Framework.Configuration; |
39 | using OpenSim.Framework.Communications; | ||
40 | using OpenSim.Region.Communications.OGS1; | ||
41 | 39 | ||
42 | namespace OpenSim.Grid.UserServer | 40 | namespace OpenSim.Grid.UserServer |
43 | { | 41 | { |
@@ -50,8 +48,6 @@ namespace OpenSim.Grid.UserServer | |||
50 | public UserManager m_userManager; | 48 | public UserManager m_userManager; |
51 | public UserLoginService m_loginService; | 49 | public UserLoginService m_loginService; |
52 | 50 | ||
53 | public IInventoryServices m_inventoryService; | ||
54 | |||
55 | LogBase m_console; | 51 | LogBase m_console; |
56 | 52 | ||
57 | [STAThread] | 53 | [STAThread] |
@@ -94,11 +90,7 @@ namespace OpenSim.Grid.UserServer | |||
94 | m_userManager._config = Cfg; | 90 | m_userManager._config = Cfg; |
95 | m_userManager.AddPlugin(Cfg.DatabaseProvider); | 91 | m_userManager.AddPlugin(Cfg.DatabaseProvider); |
96 | 92 | ||
97 | // prepare connection to the inventory server | 93 | m_loginService = new UserLoginService(m_userManager, Cfg, Cfg.DefaultStartupMsg); |
98 | m_inventoryService = new OGS1InventoryService(Cfg.InventoryServerName, Cfg.InventoryServerPort, null); | ||
99 | |||
100 | |||
101 | m_loginService = new UserLoginService(m_userManager, m_inventoryService, Cfg, Cfg.DefaultStartupMsg); | ||
102 | 94 | ||
103 | MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process"); | 95 | MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process"); |
104 | BaseHttpServer httpServer = new BaseHttpServer((int)Cfg.HttpPort); | 96 | BaseHttpServer httpServer = new BaseHttpServer((int)Cfg.HttpPort); |
@@ -111,7 +103,6 @@ namespace OpenSim.Grid.UserServer | |||
111 | httpServer.AddStreamHandler( new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod )); | 103 | httpServer.AddStreamHandler( new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod )); |
112 | 104 | ||
113 | httpServer.Start(); | 105 | httpServer.Start(); |
114 | |||
115 | m_console.Status("SERVER", "Userserver 0.3 - Startup complete"); | 106 | m_console.Status("SERVER", "Userserver 0.3 - Startup complete"); |
116 | } | 107 | } |
117 | 108 | ||