aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorMW2007-07-21 15:50:29 +0000
committerMW2007-07-21 15:50:29 +0000
commitb3cef2fc2a02510c550843fe080ff2d77d2fb743 (patch)
tree92fd4b9d0cd4a2d4aeba4cca21117807b1a3763f /OpenSim/Grid
parent* Issue#206 - Casting of a LLUUID from XMLRPC hashtable causes an error. (Tha... (diff)
downloadopensim-SC_OLD-b3cef2fc2a02510c550843fe080ff2d77d2fb743.zip
opensim-SC_OLD-b3cef2fc2a02510c550843fe080ff2d77d2fb743.tar.gz
opensim-SC_OLD-b3cef2fc2a02510c550843fe080ff2d77d2fb743.tar.bz2
opensim-SC_OLD-b3cef2fc2a02510c550843fe080ff2d77d2fb743.tar.xz
Re-added the ability to set the database provider (dll) in the config file for the userserver and gridserver.
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/GridServer/Main.cs2
-rw-r--r--OpenSim/Grid/UserServer/Main.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index c72948d..8353066 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Grid.GridServer
110 110
111 m_console.Verbose( "Main.cs:Startup() - Connecting to Storage Server"); 111 m_console.Verbose( "Main.cs:Startup() - Connecting to Storage Server");
112 m_gridManager = new GridManager(); 112 m_gridManager = new GridManager();
113 m_gridManager.AddPlugin(GridDll); // Made of win 113 m_gridManager.AddPlugin(Cfg.DatabaseProvider); // Made of win
114 m_gridManager.config = Cfg; 114 m_gridManager.config = Cfg;
115 115
116 m_console.Verbose( "Main.cs:Startup() - Starting HTTP process"); 116 m_console.Verbose( "Main.cs:Startup() - Starting HTTP process");
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 99401fc..a6571cf 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Grid.UserServer
86 MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection"); 86 MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection");
87 m_userManager = new UserManager(); 87 m_userManager = new UserManager();
88 m_userManager._config = Cfg; 88 m_userManager._config = Cfg;
89 m_userManager.AddPlugin(StorageDll); 89 m_userManager.AddPlugin(Cfg.DatabaseProvider);
90 90
91 MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process"); 91 MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process");
92 BaseHttpServer httpServer = new BaseHttpServer(8002); 92 BaseHttpServer httpServer = new BaseHttpServer(8002);