diff options
Diffstat (limited to 'OpenSim/Grid/GridServer/Main.cs')
-rw-r--r-- | OpenSim/Grid/GridServer/Main.cs | 12 |
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; | |||
34 | using System.Threading; | 34 | using System.Threading; |
35 | using System.Reflection; | 35 | using System.Reflection; |
36 | using libsecondlife; | 36 | using libsecondlife; |
37 | using OpenGrid.Framework.Manager; | 37 | using OpenSim.Framework.Manager; |
38 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
39 | using OpenSim.Framework.Sims; | 39 | using OpenSim.Framework.Sims; |
40 | using OpenSim.Framework.Console; | 40 | using OpenSim.Framework.Console; |
41 | using OpenSim.Framework.Interfaces; | 41 | using OpenSim.Framework.Interfaces; |
42 | using OpenSim.Servers; | 42 | using OpenSim.Framework.Servers; |
43 | using OpenSim.GenericConfig; | 43 | using OpenSim.GenericConfig; |
44 | 44 | ||
45 | namespace OpenGridServices.GridServer | 45 | namespace 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 | { |