Fixed GridServer to use default Recv Key if a sim profile is not present.
parent
fdd0191f59
commit
315e4dede6
|
@ -16,6 +16,7 @@ namespace OpenGridServices.GridServer
|
||||||
class GridManager
|
class GridManager
|
||||||
{
|
{
|
||||||
Dictionary<string, IGridData> _plugins = new Dictionary<string, IGridData>();
|
Dictionary<string, IGridData> _plugins = new Dictionary<string, IGridData>();
|
||||||
|
public string defaultRecvKey;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Adds a new grid server plugin - grid servers will be requested in the order they were loaded.
|
/// Adds a new grid server plugin - grid servers will be requested in the order they were loaded.
|
||||||
|
@ -268,7 +269,7 @@ namespace OpenGridServices.GridServer
|
||||||
TheSim = new SimProfileData();
|
TheSim = new SimProfileData();
|
||||||
LLUUID UUID = new LLUUID(param);
|
LLUUID UUID = new LLUUID(param);
|
||||||
TheSim.UUID = UUID;
|
TheSim.UUID = UUID;
|
||||||
TheSim.regionRecvKey = "badger";// MAJORFIX
|
TheSim.regionRecvKey = defaultRecvKey;
|
||||||
}
|
}
|
||||||
|
|
||||||
XmlDocument doc = new XmlDocument();
|
XmlDocument doc = new XmlDocument();
|
||||||
|
|
|
@ -98,6 +98,7 @@ namespace OpenGridServices.GridServer
|
||||||
m_console.WriteLine("Main.cs:Startup() - Connecting to Storage Server");
|
m_console.WriteLine("Main.cs:Startup() - Connecting to Storage Server");
|
||||||
m_gridManager = new GridManager();
|
m_gridManager = new GridManager();
|
||||||
m_gridManager.AddPlugin(GridDll); // Made of win
|
m_gridManager.AddPlugin(GridDll); // Made of win
|
||||||
|
m_gridManager.defaultRecvKey = Cfg.SimRecvKey;
|
||||||
|
|
||||||
m_console.WriteLine("Main.cs:Startup() - Starting HTTP process");
|
m_console.WriteLine("Main.cs:Startup() - Starting HTTP process");
|
||||||
BaseHttpServer httpServer = new BaseHttpServer(8001);
|
BaseHttpServer httpServer = new BaseHttpServer(8001);
|
||||||
|
|
Loading…
Reference in New Issue