aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenGridServices.GridServer/Main.cs
diff options
context:
space:
mode:
authorAdam Frisby2007-05-13 14:59:24 +0000
committerAdam Frisby2007-05-13 14:59:24 +0000
commitb1101797307504cfc2eea6317d4c4dc2b5964480 (patch)
tree35d7ec88ff9ce0171260ba7166bc6cb3c1fcbb4d /OpenGridServices.GridServer/Main.cs
parentInventory should be working again in sandbox mode (diff)
downloadopensim-SC_OLD-b1101797307504cfc2eea6317d4c4dc2b5964480.zip
opensim-SC_OLD-b1101797307504cfc2eea6317d4c4dc2b5964480.tar.gz
opensim-SC_OLD-b1101797307504cfc2eea6317d4c4dc2b5964480.tar.bz2
opensim-SC_OLD-b1101797307504cfc2eea6317d4c4dc2b5964480.tar.xz
* Fixed MySQL Grid Manager
* Added preliminary support for DB UserServer (incomplete) * Added better handling of defaults to Grid Manager. * Renamed SQL/regions.sql to SQL/mysql-regions.sql.
Diffstat (limited to 'OpenGridServices.GridServer/Main.cs')
-rw-r--r--OpenGridServices.GridServer/Main.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenGridServices.GridServer/Main.cs b/OpenGridServices.GridServer/Main.cs
index 532e15d..69d75fd 100644
--- a/OpenGridServices.GridServer/Main.cs
+++ b/OpenGridServices.GridServer/Main.cs
@@ -47,7 +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 private string GridDll = "OpenGrid.Framework.Data.MySQL.dll";
51 public GridConfig Cfg; 51 public GridConfig Cfg;
52 52
53 public static OpenGrid_Main thegrid; 53 public static OpenGrid_Main thegrid;
@@ -98,7 +98,7 @@ namespace OpenGridServices.GridServer
98 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Connecting to Storage Server"); 98 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Connecting to Storage Server");
99 m_gridManager = new GridManager(); 99 m_gridManager = new GridManager();
100 m_gridManager.AddPlugin(GridDll); // Made of win 100 m_gridManager.AddPlugin(GridDll); // Made of win
101 m_gridManager.defaultRecvKey = Cfg.SimRecvKey; 101 m_gridManager.config = Cfg;
102 102
103 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Starting HTTP process"); 103 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Starting HTTP process");
104 BaseHttpServer httpServer = new BaseHttpServer(8001); 104 BaseHttpServer httpServer = new BaseHttpServer(8001);