diff options
Diffstat (limited to 'OpenSim/Grid/UserServer/Main.cs')
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index c65bb97..5560e7d 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -27,18 +27,13 @@ | |||
27 | */ | 27 | */ |
28 | 28 | ||
29 | using System; | 29 | using System; |
30 | using System.Collections; | ||
31 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
32 | using System.Reflection; | 31 | using System.Reflection; |
33 | using System.IO; | ||
34 | using System.Text; | ||
35 | using libsecondlife; | 32 | using libsecondlife; |
36 | using OpenSim.Framework.User; | ||
37 | using OpenSim.Framework.Sims; | ||
38 | using OpenSim.Framework.Inventory; | ||
39 | using OpenSim.Framework.Interfaces; | ||
40 | using OpenSim.Framework.Console; | 33 | using OpenSim.Framework.Console; |
34 | using OpenSim.Framework.Interfaces; | ||
41 | using OpenSim.Framework.Servers; | 35 | using OpenSim.Framework.Servers; |
36 | using OpenSim.Framework.User; | ||
42 | using OpenSim.Framework.Utilities; | 37 | using OpenSim.Framework.Utilities; |
43 | using OpenSim.GenericConfig; | 38 | using OpenSim.GenericConfig; |
44 | 39 | ||
@@ -73,7 +68,7 @@ namespace OpenSim.Grid.UserServer | |||
73 | private OpenUser_Main() | 68 | private OpenUser_Main() |
74 | { | 69 | { |
75 | m_console = new LogBase("opengrid-userserver-console.log", "OpenUser", this , false); | 70 | m_console = new LogBase("opengrid-userserver-console.log", "OpenUser", this , false); |
76 | OpenSim.Framework.Console.MainLog.Instance = m_console; | 71 | MainLog.Instance = m_console; |
77 | } | 72 | } |
78 | 73 | ||
79 | private void Work() | 74 | private void Work() |
@@ -93,16 +88,16 @@ namespace OpenSim.Grid.UserServer | |||
93 | this.ConfigDB(this.localXMLConfig); | 88 | this.ConfigDB(this.localXMLConfig); |
94 | this.localXMLConfig.Close(); | 89 | this.localXMLConfig.Close(); |
95 | 90 | ||
96 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Main.cs:Startup() - Loading configuration"); | 91 | MainLog.Instance.Verbose("Main.cs:Startup() - Loading configuration"); |
97 | Cfg = this.LoadConfigDll(this.ConfigDll); | 92 | Cfg = this.LoadConfigDll(this.ConfigDll); |
98 | Cfg.InitConfig(); | 93 | Cfg.InitConfig(); |
99 | 94 | ||
100 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection"); | 95 | MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection"); |
101 | m_userManager = new UserManager(); | 96 | m_userManager = new UserManager(); |
102 | m_userManager._config = Cfg; | 97 | m_userManager._config = Cfg; |
103 | m_userManager.AddPlugin(StorageDll); | 98 | m_userManager.AddPlugin(StorageDll); |
104 | 99 | ||
105 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process"); | 100 | MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process"); |
106 | BaseHttpServer httpServer = new BaseHttpServer(8002); | 101 | BaseHttpServer httpServer = new BaseHttpServer(8002); |
107 | 102 | ||
108 | httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod); | 103 | httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod); |