* Fixed MySQL Grid Manager

* Added preliminary support for DB UserServer (incomplete)
* Added better handling of defaults to Grid Manager.
* Renamed SQL/regions.sql to SQL/mysql-regions.sql.

2 files changed, 20 insertions, 4 deletions

diff --git a/OpenGridServices.GridServer/GridManager.cs b/OpenGridServices.GridServer/GridManager.cs
index 02a6a50..cfccd02 100644
--- a/OpenGridServices.GridServer/GridManager.cs
+++ b/OpenGridServices.GridServer/GridManager.cs
@@ -16,7 +16,7 @@ namespace OpenGridServices.GridServer
     class GridManager

     {

         Dictionary<string, IGridData> _plugins = new Dictionary<string, IGridData>();

-        public string defaultRecvKey;

+        public OpenSim.Framework.Interfaces.GridConfig config;

 

         /// <summary>

         /// Adds a new grid server plugin - grid servers will be requested in the order they were loaded.

@@ -269,7 +269,7 @@ namespace OpenGridServices.GridServer
                 TheSim = new SimProfileData();

                 LLUUID UUID = new LLUUID(param);

                 TheSim.UUID = UUID;

-                TheSim.regionRecvKey = defaultRecvKey;

+                TheSim.regionRecvKey = config.SimRecvKey;

             }

 

             XmlDocument doc = new XmlDocument();

@@ -291,6 +291,20 @@ namespace OpenGridServices.GridServer
             {

                 return "ERROR! invalid key";

             }

+

+            //TheSim.regionSendKey = Cfg;

+            TheSim.regionRecvKey = config.SimRecvKey;

+            TheSim.regionSendKey = config.SimSendKey;

+            TheSim.regionSecret = config.SimRecvKey;

+            TheSim.regionDataURI = "";

+            TheSim.regionAssetURI = config.DefaultAssetServer;

+            TheSim.regionAssetRecvKey = config.AssetRecvKey;

+            TheSim.regionAssetSendKey = config.AssetSendKey;

+            TheSim.regionUserURI = config.DefaultUserServer;

+            TheSim.regionUserSendKey = config.UserSendKey;

+            TheSim.regionUserRecvKey = config.UserRecvKey;

+

+

             for (int i = 0; i < simnode.ChildNodes.Count; i++)

             {

                 switch (simnode.ChildNodes[i].Name)

@@ -319,6 +333,8 @@ namespace OpenGridServices.GridServer
                 }

             }

 

+            TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/";

+

             try

             {

                 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Attempting to add a new region to the grid - " + _plugins.Count + " storage provider(s) registered.");

diff --git a/OpenGridServices.GridServer/Main.cs b/OpenGridServices.GridServer/Main.cs
index 532e15d..69d75fd 100644
--- a/OpenGridServices.GridServer/Main.cs
+++ b/OpenGridServices.GridServer/Main.cs
@@ -47,7 +47,7 @@ namespace OpenGridServices.GridServer
     public class OpenGrid_Main : BaseServer, conscmd_callback

     {

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

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

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

         public GridConfig Cfg;

         

         public static OpenGrid_Main thegrid;

@@ -98,7 +98,7 @@ namespace OpenGridServices.GridServer
             m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Connecting to Storage Server");

             m_gridManager = new GridManager();

             m_gridManager.AddPlugin(GridDll); // Made of win

-            m_gridManager.defaultRecvKey = Cfg.SimRecvKey;

+            m_gridManager.config = Cfg;

 

             m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Starting HTTP process");

             BaseHttpServer httpServer = new BaseHttpServer(8001);