aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenGridServices/OpenGridServices.UserServer/Main.cs
diff options
context:
space:
mode:
authormingchen2007-06-26 17:50:27 +0000
committermingchen2007-06-26 17:50:27 +0000
commit8ff1d0968ff3c4173b036398359ef62a356ad2b2 (patch)
tree46e740c18866096e1c4f03e4a42cf7e0c0a4539c /OpenGridServices/OpenGridServices.UserServer/Main.cs
parent* Updated demo filter to show more common usage (as well as embedding multipl... (diff)
downloadopensim-SC_OLD-8ff1d0968ff3c4173b036398359ef62a356ad2b2.zip
opensim-SC_OLD-8ff1d0968ff3c4173b036398359ef62a356ad2b2.tar.gz
opensim-SC_OLD-8ff1d0968ff3c4173b036398359ef62a356ad2b2.tar.bz2
opensim-SC_OLD-8ff1d0968ff3c4173b036398359ef62a356ad2b2.tar.xz
*Added support for reservations in OpenGridServices (mysql only for now)
*SQL file coming soon (as soon as I can figure out how to get the
Diffstat (limited to 'OpenGridServices/OpenGridServices.UserServer/Main.cs')
-rw-r--r--OpenGridServices/OpenGridServices.UserServer/Main.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenGridServices/OpenGridServices.UserServer/Main.cs b/OpenGridServices/OpenGridServices.UserServer/Main.cs
index 56a3892..5c27d57 100644
--- a/OpenGridServices/OpenGridServices.UserServer/Main.cs
+++ b/OpenGridServices/OpenGridServices.UserServer/Main.cs
@@ -73,7 +73,7 @@ namespace OpenGridServices.UserServer
73 private OpenUser_Main() 73 private OpenUser_Main()
74 { 74 {
75 m_console = new LogBase("opengrid-userserver-console.log", "OpenUser", this , false); 75 m_console = new LogBase("opengrid-userserver-console.log", "OpenUser", this , false);
76 MainLog.Instance = m_console; 76 OpenSim.Framework.Console.MainLog.Instance = m_console;
77 } 77 }
78 78
79 private void Work() 79 private void Work()
@@ -93,16 +93,16 @@ namespace OpenGridServices.UserServer
93 this.ConfigDB(this.localXMLConfig); 93 this.ConfigDB(this.localXMLConfig);
94 this.localXMLConfig.Close(); 94 this.localXMLConfig.Close();
95 95
96 MainLog.Instance.Verbose("Main.cs:Startup() - Loading configuration"); 96 OpenSim.Framework.Console.MainLog.Instance.Verbose("Main.cs:Startup() - Loading configuration");
97 Cfg = this.LoadConfigDll(this.ConfigDll); 97 Cfg = this.LoadConfigDll(this.ConfigDll);
98 Cfg.InitConfig(); 98 Cfg.InitConfig();
99 99
100 MainLog.Instance.Verbose( "Main.cs:Startup() - Establishing data connection"); 100 OpenSim.Framework.Console.MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection");
101 m_userManager = new UserManager(); 101 m_userManager = new UserManager();
102 m_userManager._config = Cfg; 102 m_userManager._config = Cfg;
103 m_userManager.AddPlugin(StorageDll); 103 m_userManager.AddPlugin(StorageDll);
104 104
105 MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process"); 105 OpenSim.Framework.Console.MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process");
106 BaseHttpServer httpServer = new BaseHttpServer(8002); 106 BaseHttpServer httpServer = new BaseHttpServer(8002);
107 107
108 httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod); 108 httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod);