aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorgareth2007-05-17 07:16:54 +0000
committergareth2007-05-17 07:16:54 +0000
commit0120938f7aa8ade4c1d39ce127b3b1af4279a111 (patch)
tree71736d85b16dba7a7a0298d9d05c8c6c28c88317
parentadded Adam's notes about how terrain block addressing map on to grid locations (diff)
downloadopensim-SC-0120938f7aa8ade4c1d39ce127b3b1af4279a111.zip
opensim-SC-0120938f7aa8ade4c1d39ce127b3b1af4279a111.tar.gz
opensim-SC-0120938f7aa8ade4c1d39ce127b3b1af4279a111.tar.bz2
opensim-SC-0120938f7aa8ade4c1d39ce127b3b1af4279a111.tar.xz
Fixed grid management agent
Diffstat (limited to '')
-rw-r--r--OpenGridServices.GridServer/Main.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenGridServices.GridServer/Main.cs b/OpenGridServices.GridServer/Main.cs
index cacef5e..8fdce08 100644
--- a/OpenGridServices.GridServer/Main.cs
+++ b/OpenGridServices.GridServer/Main.cs
@@ -35,7 +35,7 @@ using System.Net;
35using System.Threading; 35using System.Threading;
36using System.Reflection; 36using System.Reflection;
37using libsecondlife; 37using libsecondlife;
38//using OpenGrid.Framework.Manager; 38using OpenGrid.Framework.Manager;
39using OpenSim.Framework; 39using OpenSim.Framework;
40using OpenSim.Framework.Sims; 40using OpenSim.Framework.Sims;
41using OpenSim.Framework.Console; 41using OpenSim.Framework.Console;
@@ -118,7 +118,7 @@ namespace OpenGridServices.GridServer
118 118
119 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Starting HTTP process"); 119 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Starting HTTP process");
120 BaseHttpServer httpServer = new BaseHttpServer(8001); 120 BaseHttpServer httpServer = new BaseHttpServer(8001);
121 //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer,"gridserver",Cfg.SimSendKey,Cfg.SimRecvKey,managercallback); 121 GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer,"gridserver",Cfg.SimSendKey,Cfg.SimRecvKey,managercallback);
122 122
123 httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcLoginToSimulatorMethod); 123 httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcLoginToSimulatorMethod);
124 124