aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenGridServices.GridServer/Main.cs
diff options
context:
space:
mode:
authorgareth2007-05-07 16:32:30 +0000
committergareth2007-05-07 16:32:30 +0000
commit3de3d8bb3ba9b0781a2078c8698816ae5b72f7b1 (patch)
tree5d6b1009685278b214100a7901bd4feaeed584da /OpenGridServices.GridServer/Main.cs
parentUpdated to have uniform build number (diff)
downloadopensim-SC_OLD-3de3d8bb3ba9b0781a2078c8698816ae5b72f7b1.zip
opensim-SC_OLD-3de3d8bb3ba9b0781a2078c8698816ae5b72f7b1.tar.gz
opensim-SC_OLD-3de3d8bb3ba9b0781a2078c8698816ae5b72f7b1.tar.bz2
opensim-SC_OLD-3de3d8bb3ba9b0781a2078c8698816ae5b72f7b1.tar.xz
Merged 0.1-prestable back into trunk :(
Diffstat (limited to '')
-rw-r--r--OpenGridServices.GridServer/Main.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenGridServices.GridServer/Main.cs b/OpenGridServices.GridServer/Main.cs
index f7cfe71..ba6c60d 100644
--- a/OpenGridServices.GridServer/Main.cs
+++ b/OpenGridServices.GridServer/Main.cs
@@ -47,6 +47,7 @@ namespace OpenGridServices.GridServer
47 public class OpenGrid_Main : BaseServer, conscmd_callback 47 public class OpenGrid_Main : BaseServer, conscmd_callback
48 { 48 {
49 private string ConfigDll = "OpenGrid.Config.GridConfigDb4o.dll"; 49 private string ConfigDll = "OpenGrid.Config.GridConfigDb4o.dll";
50 private string GridDll = "OpenGrid.Framework.Data.DB4o.dll";
50 public GridConfig Cfg; 51 public GridConfig Cfg;
51 52
52 public static OpenGrid_Main thegrid; 53 public static OpenGrid_Main thegrid;
@@ -94,9 +95,10 @@ namespace OpenGridServices.GridServer
94 Cfg = this.LoadConfigDll(this.ConfigDll); 95 Cfg = this.LoadConfigDll(this.ConfigDll);
95 Cfg.InitConfig(); 96 Cfg.InitConfig();
96 97
97 m_console.WriteLine("Main.cs:Startup() - Connecting to MySql Server"); 98 m_console.WriteLine("Main.cs:Startup() - Connecting to Storage Server");
98 m_gridManager = new GridManager(); 99 m_gridManager = new GridManager();
99 m_gridManager.AddPlugin("OpenGrid.Framework.Data.MySQL.dll"); // Made of win 100 m_gridManager.AddPlugin(GridDll); // Made of win
101 m_gridManager.defaultRecvKey = Cfg.SimRecvKey;
100 102
101 m_console.WriteLine("Main.cs:Startup() - Starting HTTP process"); 103 m_console.WriteLine("Main.cs:Startup() - Starting HTTP process");
102 BaseHttpServer httpServer = new BaseHttpServer(8001); 104 BaseHttpServer httpServer = new BaseHttpServer(8001);