aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs
diff options
context:
space:
mode:
authorDr Scofield2008-07-28 12:18:48 +0000
committerDr Scofield2008-07-28 12:18:48 +0000
commit03efaff60e2c4204bfac33de22e69377ba28be7c (patch)
tree711c9515a16d241b87857093876ebeafa91ae4cf /OpenSim/Region/Application/OpenSimBase.cs
parentAdd Shared/LSL_Types* tests to Bamboo. (diff)
downloadopensim-SC_OLD-03efaff60e2c4204bfac33de22e69377ba28be7c.zip
opensim-SC_OLD-03efaff60e2c4204bfac33de22e69377ba28be7c.tar.gz
opensim-SC_OLD-03efaff60e2c4204bfac33de22e69377ba28be7c.tar.bz2
opensim-SC_OLD-03efaff60e2c4204bfac33de22e69377ba28be7c.tar.xz
moving GridInfo application plugin into a common standalone/grid
service, adding a plain REST GET handler returning XML (no LLSD), adding appropriate add handler calls to OpenSimBase and UserServer.
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 6889a61..c2d30e4 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -40,6 +40,7 @@ using OpenSim.Framework.Communications.Cache;
40using OpenSim.Framework.Console; 40using OpenSim.Framework.Console;
41using OpenSim.Framework.Servers; 41using OpenSim.Framework.Servers;
42using OpenSim.Framework.Statistics; 42using OpenSim.Framework.Statistics;
43using OpenSim.Common.Communications;
43using OpenSim.Region.ClientStack; 44using OpenSim.Region.ClientStack;
44using OpenSim.Region.Communications.Local; 45using OpenSim.Region.Communications.Local;
45using OpenSim.Region.Communications.OGS1; 46using OpenSim.Region.Communications.OGS1;
@@ -79,6 +80,7 @@ namespace OpenSim
79 public bool m_see_into_region_from_neighbor; 80 public bool m_see_into_region_from_neighbor;
80 81
81 protected LocalLoginService m_loginService; 82 protected LocalLoginService m_loginService;
83 protected GridInfoService m_gridInfoService;
82 84
83 protected string m_storageDll; 85 protected string m_storageDll;
84 protected string m_clientstackDll; 86 protected string m_clientstackDll;
@@ -382,6 +384,11 @@ namespace OpenSim
382 // Provides the LLSD login 384 // Provides the LLSD login
383 m_httpServer.SetLLSDHandler(m_loginService.LLSDLoginMethod); 385 m_httpServer.SetLLSDHandler(m_loginService.LLSDLoginMethod);
384 386
387 // provide grid info
388 m_gridInfoService = new GridInfoService();
389 m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod);
390 m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod));
391
385 CreateAccount = localComms.doCreate; 392 CreateAccount = localComms.doCreate;
386 } 393 }
387 else 394 else