aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer/Main.cs
diff options
context:
space:
mode:
authormingchen2007-06-27 18:04:07 +0000
committermingchen2007-06-27 18:04:07 +0000
commit2261e4ec2a43a56dbb74168a169f39b2c6c1f054 (patch)
tree41c46ae07beb837ac109228a0a3731a10b422296 /OpenSim/Grid/GridServer/Main.cs
parent*More compile fixes (should be it on OpenSim.sln) (diff)
downloadopensim-SC_OLD-2261e4ec2a43a56dbb74168a169f39b2c6c1f054.zip
opensim-SC_OLD-2261e4ec2a43a56dbb74168a169f39b2c6c1f054.tar.gz
opensim-SC_OLD-2261e4ec2a43a56dbb74168a169f39b2c6c1f054.tar.bz2
opensim-SC_OLD-2261e4ec2a43a56dbb74168a169f39b2c6c1f054.tar.xz
*Fixed all renaming for OpenGridServices.sln, still a reference issue in prebuild.xml though
Diffstat (limited to 'OpenSim/Grid/GridServer/Main.cs')
-rw-r--r--OpenSim/Grid/GridServer/Main.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index b948fd6..b225214 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -34,22 +34,22 @@ using System.Net;
34using System.Threading; 34using System.Threading;
35using System.Reflection; 35using System.Reflection;
36using libsecondlife; 36using libsecondlife;
37using OpenGrid.Framework.Manager; 37using OpenSim.Framework.Manager;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Framework.Sims; 39using OpenSim.Framework.Sims;
40using OpenSim.Framework.Console; 40using OpenSim.Framework.Console;
41using OpenSim.Framework.Interfaces; 41using OpenSim.Framework.Interfaces;
42using OpenSim.Servers; 42using OpenSim.Framework.Servers;
43using OpenSim.GenericConfig; 43using OpenSim.GenericConfig;
44 44
45namespace OpenGridServices.GridServer 45namespace OpenSim.Grid.GridServer
46{ 46{
47 /// <summary> 47 /// <summary>
48 /// </summary> 48 /// </summary>
49 public class OpenGrid_Main : conscmd_callback 49 public class OpenGrid_Main : conscmd_callback
50 { 50 {
51 private string ConfigDll = "OpenGrid.Config.GridConfigDb4o.dll"; 51 private string ConfigDll = "OpenGrid.Config.GridConfigDb4o.dll";
52 private string GridDll = "OpenGrid.Framework.Data.MySQL.dll"; 52 private string GridDll = "OpenSim.Framework.Data.MySQL.dll";
53 public GridConfig Cfg; 53 public GridConfig Cfg;
54 54
55 public static OpenGrid_Main thegrid; 55 public static OpenGrid_Main thegrid;
@@ -253,8 +253,8 @@ namespace OpenGridServices.GridServer
253 attri = configData.GetAttribute("DataBaseProvider"); 253 attri = configData.GetAttribute("DataBaseProvider");
254 if (attri == "") 254 if (attri == "")
255 { 255 {
256 GridDll = "OpenGrid.Framework.Data.DB4o.dll"; 256 GridDll = "OpenSim.Framework.Data.DB4o.dll";
257 configData.SetAttribute("DataBaseProvider", "OpenGrid.Framework.Data.DB4o.dll"); 257 configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll");
258 } 258 }
259 else 259 else
260 { 260 {