*Added support for reservations in OpenGridServices (mysql only for now)

*SQL file coming soon (as soon as I can figure out how to get the

1 files changed, 4 insertions, 4 deletions

diff --git a/OpenGridServices/OpenGridServices.UserServer/Main.cs b/OpenGridServices/OpenGridServices.UserServer/Main.cs
index 56a3892..5c27d57 100644
--- a/OpenGridServices/OpenGridServices.UserServer/Main.cs
+++ b/OpenGridServices/OpenGridServices.UserServer/Main.cs
@@ -73,7 +73,7 @@ namespace OpenGridServices.UserServer
         private OpenUser_Main()

         {

             m_console = new LogBase("opengrid-userserver-console.log", "OpenUser", this , false);

-            MainLog.Instance = m_console;

+            OpenSim.Framework.Console.MainLog.Instance = m_console;

         }

 

         private void Work()

@@ -93,16 +93,16 @@ namespace OpenGridServices.UserServer
             this.ConfigDB(this.localXMLConfig);

             this.localXMLConfig.Close();

 

-            MainLog.Instance.Verbose("Main.cs:Startup() - Loading configuration");

+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Main.cs:Startup() - Loading configuration");

             Cfg = this.LoadConfigDll(this.ConfigDll);

             Cfg.InitConfig();

 

-            MainLog.Instance.Verbose( "Main.cs:Startup() - Establishing data connection");

+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection");

             m_userManager = new UserManager();

             m_userManager._config = Cfg;

             m_userManager.AddPlugin(StorageDll);

 

-            MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process");

+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process");

             BaseHttpServer httpServer = new BaseHttpServer(8002);

 

             httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod);