*Fixed all renaming for OpenGridServices.sln, still a reference issue in prebuild.xml though

2 files changed, 8 insertions, 8 deletions

diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index bf80652..c78d14a 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -30,7 +30,7 @@ using System.Collections;
 using System.Collections.Generic;

 using System.Text;

 using System.Reflection;

-using OpenGrid.Framework.Data;

+using OpenSim.Framework.Data;

 using OpenSim.Framework.Utilities;

 using OpenSim.Framework.Console;

 using OpenSim.Framework.Sims;

@@ -38,7 +38,7 @@ using libsecondlife;
 using Nwc.XmlRpc;

 using System.Xml;

 

-namespace OpenGridServices.GridServer

+namespace OpenSim.Grid.GridServer

 {

     class GridManager

     {

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;
 using System.Threading;

 using System.Reflection;

 using libsecondlife;

-using OpenGrid.Framework.Manager;

+using OpenSim.Framework.Manager;

 using OpenSim.Framework;

 using OpenSim.Framework.Sims;

 using OpenSim.Framework.Console;

 using OpenSim.Framework.Interfaces;

-using OpenSim.Servers;

+using OpenSim.Framework.Servers;

 using OpenSim.GenericConfig;

 

-namespace OpenGridServices.GridServer

+namespace OpenSim.Grid.GridServer

 {

     /// <summary>

     /// </summary>

     public class OpenGrid_Main : conscmd_callback

     {

         private string ConfigDll = "OpenGrid.Config.GridConfigDb4o.dll";

-        private string GridDll = "OpenGrid.Framework.Data.MySQL.dll";

+        private string GridDll = "OpenSim.Framework.Data.MySQL.dll";

         public GridConfig Cfg;

 

         public static OpenGrid_Main thegrid;

@@ -253,8 +253,8 @@ namespace OpenGridServices.GridServer
                 attri = configData.GetAttribute("DataBaseProvider");

                 if (attri == "")

                 {

-                    GridDll = "OpenGrid.Framework.Data.DB4o.dll";

-                    configData.SetAttribute("DataBaseProvider", "OpenGrid.Framework.Data.DB4o.dll");

+                    GridDll = "OpenSim.Framework.Data.DB4o.dll";

+                    configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll");

                 }

                 else

                 {