From e985e05a5ad7df4c5f01763dfe6b82cc1b37ab83 Mon Sep 17 00:00:00 2001 From: gareth Date: Mon, 2 Apr 2007 00:48:25 +0000 Subject: Added new REST protocol (partially complete) Made sim profiles load from DB Updated build files for grid server Added sim login --- OpenGridServices.GridServer/Main.cs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'OpenGridServices.GridServer/Main.cs') diff --git a/OpenGridServices.GridServer/Main.cs b/OpenGridServices.GridServer/Main.cs index 2382fd7..46041d9 100644 --- a/OpenGridServices.GridServer/Main.cs +++ b/OpenGridServices.GridServer/Main.cs @@ -39,7 +39,6 @@ namespace OpenGridServices.GridServer /// public class OpenGrid_Main : conscmd_callback { - public static OpenGrid_Main thegrid; public string GridOwner; public string DefaultStartupMsg; @@ -49,6 +48,9 @@ namespace OpenGridServices.GridServer public string DefaultUserServer; public string UserSendKey; public string UserRecvKey; + public string SimSendKey; + public string SimRecvKey; + public LLUUID highestUUID; public GridHTTPServer _httpd; public SimProfileManager _regionmanager; @@ -97,11 +99,16 @@ namespace OpenGridServices.GridServer this.UserSendKey = m_console.CmdPrompt("Key to send to user server: "); this.UserRecvKey = m_console.CmdPrompt("Key to expect from user server: "); - m_console.WriteLine("Main.cs:Startup() - Starting HTTP process"); + this.SimSendKey = m_console.CmdPrompt("Key to send to sims: "); + this.SimRecvKey = m_console.CmdPrompt("Key to expect from sims: "); + + m_console.WriteLine("Main.cs:Startup() - Loading sim profiles from database"); + this._regionmanager = new SimProfileManager(); + _regionmanager.LoadProfiles(); + + m_console.WriteLine("Main.cs:Startup() - Starting HTTP process"); _httpd = new GridHTTPServer(); - this._regionmanager = new SimProfileManager(); - _regionmanager.CreateNewProfile("OpenSim Test", "http://there-is-no-caps.com", "4.78.190.75", 9000, 997, 996, this.UserSendKey, this.UserRecvKey); } public void RunCmd(string cmd, string[] cmdparams) -- cgit v1.1