diff options
author | gareth | 2007-04-02 00:48:25 +0000 |
---|---|---|
committer | gareth | 2007-04-02 00:48:25 +0000 |
commit | e985e05a5ad7df4c5f01763dfe6b82cc1b37ab83 (patch) | |
tree | 7b07b8fae3ade588d11cdeeabf1f2479e80a8dff /OpenGridServices.GridServer/Main.cs | |
parent | More refactoring (diff) | |
download | opensim-SC_OLD-e985e05a5ad7df4c5f01763dfe6b82cc1b37ab83.zip opensim-SC_OLD-e985e05a5ad7df4c5f01763dfe6b82cc1b37ab83.tar.gz opensim-SC_OLD-e985e05a5ad7df4c5f01763dfe6b82cc1b37ab83.tar.bz2 opensim-SC_OLD-e985e05a5ad7df4c5f01763dfe6b82cc1b37ab83.tar.xz |
Added new REST protocol (partially complete)
Made sim profiles load from DB
Updated build files for grid server
Added sim login
Diffstat (limited to 'OpenGridServices.GridServer/Main.cs')
-rw-r--r-- | OpenGridServices.GridServer/Main.cs | 15 |
1 files changed, 11 insertions, 4 deletions
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 | |||
39 | /// </summary> | 39 | /// </summary> |
40 | public class OpenGrid_Main : conscmd_callback | 40 | public class OpenGrid_Main : conscmd_callback |
41 | { | 41 | { |
42 | |||
43 | public static OpenGrid_Main thegrid; | 42 | public static OpenGrid_Main thegrid; |
44 | public string GridOwner; | 43 | public string GridOwner; |
45 | public string DefaultStartupMsg; | 44 | public string DefaultStartupMsg; |
@@ -49,6 +48,9 @@ namespace OpenGridServices.GridServer | |||
49 | public string DefaultUserServer; | 48 | public string DefaultUserServer; |
50 | public string UserSendKey; | 49 | public string UserSendKey; |
51 | public string UserRecvKey; | 50 | public string UserRecvKey; |
51 | public string SimSendKey; | ||
52 | public string SimRecvKey; | ||
53 | public LLUUID highestUUID; | ||
52 | 54 | ||
53 | public GridHTTPServer _httpd; | 55 | public GridHTTPServer _httpd; |
54 | public SimProfileManager _regionmanager; | 56 | public SimProfileManager _regionmanager; |
@@ -97,11 +99,16 @@ namespace OpenGridServices.GridServer | |||
97 | this.UserSendKey = m_console.CmdPrompt("Key to send to user server: "); | 99 | this.UserSendKey = m_console.CmdPrompt("Key to send to user server: "); |
98 | this.UserRecvKey = m_console.CmdPrompt("Key to expect from user server: "); | 100 | this.UserRecvKey = m_console.CmdPrompt("Key to expect from user server: "); |
99 | 101 | ||
100 | m_console.WriteLine("Main.cs:Startup() - Starting HTTP process"); | 102 | this.SimSendKey = m_console.CmdPrompt("Key to send to sims: "); |
103 | this.SimRecvKey = m_console.CmdPrompt("Key to expect from sims: "); | ||
104 | |||
105 | m_console.WriteLine("Main.cs:Startup() - Loading sim profiles from database"); | ||
106 | this._regionmanager = new SimProfileManager(); | ||
107 | _regionmanager.LoadProfiles(); | ||
108 | |||
109 | m_console.WriteLine("Main.cs:Startup() - Starting HTTP process"); | ||
101 | _httpd = new GridHTTPServer(); | 110 | _httpd = new GridHTTPServer(); |
102 | 111 | ||
103 | this._regionmanager = new SimProfileManager(); | ||
104 | _regionmanager.CreateNewProfile("OpenSim Test", "http://there-is-no-caps.com", "4.78.190.75", 9000, 997, 996, this.UserSendKey, this.UserRecvKey); | ||
105 | } | 112 | } |
106 | 113 | ||
107 | public void RunCmd(string cmd, string[] cmdparams) | 114 | public void RunCmd(string cmd, string[] cmdparams) |