aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1
diff options
context:
space:
mode:
authorMelanie Thielker2009-07-10 02:22:26 +0000
committerMelanie Thielker2009-07-10 02:22:26 +0000
commitc310fb11f492419de60b4bf8e5bb234e4589b336 (patch)
treea7bccfad7cde51ec830fdad59d5729091b2e69ae /OpenSim/Region/Communications/OGS1
parentCreate a MainServer static class to access the regions server's HTTP server (diff)
downloadopensim-SC_OLD-c310fb11f492419de60b4bf8e5bb234e4589b336.zip
opensim-SC_OLD-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.gz
opensim-SC_OLD-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.bz2
opensim-SC_OLD-c310fb11f492419de60b4bf8e5bb234e4589b336.tar.xz
Remove all references to HttpServer from CommsManager (all incarnations)
Change all uses of the HttpServer properties to use the new singleton
Diffstat (limited to 'OpenSim/Region/Communications/OGS1')
-rw-r--r--OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs8
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs12
2 files changed, 6 insertions, 14 deletions
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index 03779c5..323f813 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -35,11 +35,11 @@ namespace OpenSim.Region.Communications.OGS1
35 public class CommunicationsOGS1 : CommunicationsManager 35 public class CommunicationsOGS1 : CommunicationsManager
36 { 36 {
37 public CommunicationsOGS1( 37 public CommunicationsOGS1(
38 NetworkServersInfo serversInfo, BaseHttpServer httpServer, 38 NetworkServersInfo serversInfo,
39 IAssetCache assetCache, LibraryRootFolder libraryRootFolder) 39 LibraryRootFolder libraryRootFolder)
40 : base(serversInfo, httpServer, assetCache, false, libraryRootFolder) 40 : base(serversInfo, libraryRootFolder)
41 { 41 {
42 OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer); 42 OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo);
43 m_gridService = gridInterComms; 43 m_gridService = gridInterComms;
44 44
45 if (serversInfo.secureInventoryServer) 45 if (serversInfo.secureInventoryServer)
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index a526bb2..9ba84a7 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -59,7 +59,6 @@ namespace OpenSim.Region.Communications.OGS1
59 59
60 public BaseHttpServer httpListener; 60 public BaseHttpServer httpListener;
61 public NetworkServersInfo serversInfo; 61 public NetworkServersInfo serversInfo;
62 public BaseHttpServer httpServer;
63 62
64 public string gdebugRegionName 63 public string gdebugRegionName
65 { 64 {
@@ -85,19 +84,12 @@ namespace OpenSim.Region.Communications.OGS1
85 /// </summary> 84 /// </summary>
86 /// <param name="servers_info"></param> 85 /// <param name="servers_info"></param>
87 /// <param name="httpServe"></param> 86 /// <param name="httpServe"></param>
88 public OGS1GridServices(NetworkServersInfo servers_info, BaseHttpServer httpServe) 87 public OGS1GridServices(NetworkServersInfo servers_info)
89 { 88 {
90 serversInfo = servers_info; 89 serversInfo = servers_info;
91 httpServer = httpServe;
92 90
93 //Respond to Grid Services requests 91 //Respond to Grid Services requests
94 // httpServer.AddXmlRPCHandler("expect_user", ExpectUser); 92 MainServer.Instance.AddXmlRPCHandler("check", PingCheckReply);
95 // httpServer.AddXmlRPCHandler("logoff_user", LogOffUser);
96 httpServer.AddXmlRPCHandler("check", PingCheckReply);
97
98 // Retired into the new service connectors, 6/14/09
99 //httpServer.AddXmlRPCHandler("land_data", LandData);
100
101 } 93 }
102 94
103 // see IGridServices 95 // see IGridServices