aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
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
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 '')
-rw-r--r--OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs10
-rw-r--r--OpenSim/Client/Linden/LLProxyLoginModule.cs4
-rw-r--r--OpenSim/Client/Linden/LLStandaloneLoginModule.cs2
-rw-r--r--OpenSim/Client/VWoHTTP/VWoHTTPModule.cs6
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs20
-rw-r--r--OpenSim/Grid/UserServer/UserServerCommsManager.cs2
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs2
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs8
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs2
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServices.cs11
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs8
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs8
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs8
-rw-r--r--OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs8
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs12
-rw-r--r--OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs2
-rw-r--r--OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs2
-rw-r--r--OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs6
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs8
-rw-r--r--OpenSim/Region/DataSnapshot/DataRequestHandler.cs3
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs12
-rw-r--r--OpenSim/Region/ReplaceableModules/MoneyModule/SampleMoneyModule.cs2
-rw-r--r--OpenSim/Region/UserStatistics/WebStatsModule.cs6
-rw-r--r--OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs2
39 files changed, 83 insertions, 113 deletions
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index d56a9d9..4d6467a 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -168,8 +168,8 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
168 { 168 {
169 m_commsManager 169 m_commsManager
170 = new CommunicationsLocal( 170 = new CommunicationsLocal(
171 m_openSim.ConfigurationSettings, m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, 171 m_openSim.ConfigurationSettings, m_openSim.NetServersInfo,
172 libraryRootFolder, false); 172 libraryRootFolder);
173 173
174 CreateGridInfoService(); 174 CreateGridInfoService();
175 } 175 }
@@ -177,7 +177,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
177 protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder) 177 protected virtual void InitialiseGridServices(LibraryRootFolder libraryRootFolder)
178 { 178 {
179 m_commsManager 179 m_commsManager
180 = new CommunicationsOGS1(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, libraryRootFolder); 180 = new CommunicationsOGS1(m_openSim.NetServersInfo, libraryRootFolder);
181 181
182 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); 182 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
183 m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); 183 m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim));
@@ -206,8 +206,8 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
206 { 206 {
207 m_commsManager 207 m_commsManager
208 = new HGCommunicationsGridMode( 208 = new HGCommunicationsGridMode(
209 m_openSim.NetServersInfo, m_httpServer, 209 m_openSim.NetServersInfo,
210 m_openSim.AssetCache, m_openSim.SceneManager, libraryRootFolder); 210 m_openSim.SceneManager, libraryRootFolder);
211 211
212 HGServices = ((HGCommunicationsGridMode) m_commsManager).HGServices; 212 HGServices = ((HGCommunicationsGridMode) m_commsManager).HGServices;
213 213
diff --git a/OpenSim/Client/Linden/LLProxyLoginModule.cs b/OpenSim/Client/Linden/LLProxyLoginModule.cs
index 88b7972..f7608d1 100644
--- a/OpenSim/Client/Linden/LLProxyLoginModule.cs
+++ b/OpenSim/Client/Linden/LLProxyLoginModule.cs
@@ -143,8 +143,8 @@ namespace OpenSim.Client.Linden
143 protected void AddHttpHandlers() 143 protected void AddHttpHandlers()
144 { 144 {
145 //we will add our handlers to the first scene we received, as all scenes share a http server. But will this ever change? 145 //we will add our handlers to the first scene we received, as all scenes share a http server. But will this ever change?
146 m_firstScene.CommsManager.HttpServer.AddXmlRPCHandler("expect_user", ExpectUser); 146 MainServer.Instance.AddXmlRPCHandler("expect_user", ExpectUser);
147 m_firstScene.CommsManager.HttpServer.AddXmlRPCHandler("logoff_user", LogOffUser); 147 MainServer.Instance.AddXmlRPCHandler("logoff_user", LogOffUser);
148 } 148 }
149 149
150 protected void AddScene(Scene scene) 150 protected void AddScene(Scene scene)
diff --git a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
index 02a3b37..21197f8 100644
--- a/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
+++ b/OpenSim/Client/Linden/LLStandaloneLoginModule.cs
@@ -130,7 +130,7 @@ namespace OpenSim.Client.Linden
130 LibraryRootFolder rootFolder 130 LibraryRootFolder rootFolder
131 = m_firstScene.CommsManager.UserProfileCacheService.LibraryRoot as LibraryRootFolder; 131 = m_firstScene.CommsManager.UserProfileCacheService.LibraryRoot as LibraryRootFolder;
132 132
133 IHttpServer httpServer = m_firstScene.CommsManager.HttpServer; 133 IHttpServer httpServer = MainServer.Instance;
134 134
135 //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference 135 //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference
136 m_loginService 136 m_loginService
diff --git a/OpenSim/Client/VWoHTTP/VWoHTTPModule.cs b/OpenSim/Client/VWoHTTP/VWoHTTPModule.cs
index b1596be..31385ba 100644
--- a/OpenSim/Client/VWoHTTP/VWoHTTPModule.cs
+++ b/OpenSim/Client/VWoHTTP/VWoHTTPModule.cs
@@ -20,8 +20,7 @@
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 25 */
27 26
@@ -31,6 +30,7 @@ using System.Text;
31using Nini.Config; 30using Nini.Config;
32using OpenMetaverse; 31using OpenMetaverse;
33using OpenSim.Client.VWoHTTP.ClientStack; 32using OpenSim.Client.VWoHTTP.ClientStack;
33using OpenSim.Framework;
34using OpenSim.Framework.Servers; 34using OpenSim.Framework.Servers;
35using OpenSim.Framework.Servers.HttpServer; 35using OpenSim.Framework.Servers.HttpServer;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
@@ -57,7 +57,7 @@ namespace OpenSim.Client.VWoHTTP
57 57
58 m_scenes.Add(scene); 58 m_scenes.Add(scene);
59 59
60 m_httpd = scene.CommsManager.HttpServer; 60 m_httpd = MainServer.Instance;
61 } 61 }
62 62
63 public void PostInitialise() 63 public void PostInitialise()
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index c78212d..e1a70e5 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -29,12 +29,11 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Framework.Communications.Cache; 31using OpenSim.Framework.Communications.Cache;
32using OpenSim.Framework.Servers.HttpServer;
33 32
34namespace OpenSim.Framework.Communications 33namespace OpenSim.Framework.Communications
35{ 34{
36 /// <summary> 35 /// <summary>
37 /// This class manages references to OpenSim non-region services (asset, inventory, user, etc.) 36 /// This class manages references to OpenSim non-region services (inventory, user, etc.)
38 /// </summary> 37 /// </summary>
39 /// 38 ///
40 /// TODO: Service retrieval needs to be managed via plugin and interfaces requests, as happens for region 39 /// TODO: Service retrieval needs to be managed via plugin and interfaces requests, as happens for region
@@ -99,28 +98,15 @@ namespace OpenSim.Framework.Communications
99 } 98 }
100 protected IUserAdminService m_userAdminService; 99 protected IUserAdminService m_userAdminService;
101 100
102 /// <value>
103 /// OpenSimulator's built in HTTP server
104 /// </value>
105 public IHttpServer HttpServer
106 {
107 get { return m_httpServer; }
108 }
109 protected IHttpServer m_httpServer;
110
111 /// <summary> 101 /// <summary>
112 /// Constructor 102 /// Constructor
113 /// </summary> 103 /// </summary>
114 /// <param name="serversInfo"></param> 104 /// <param name="serversInfo"></param>
115 /// <param name="httpServer"></param> 105 public CommunicationsManager(NetworkServersInfo serversInfo,
116 /// <param name="assetCache"></param> 106 LibraryRootFolder libraryRootFolder)
117 /// <param name="dumpAssetsToFile"></param>
118 public CommunicationsManager(NetworkServersInfo serversInfo, IHttpServer httpServer, IAssetCache assetCache,
119 bool dumpAssetsToFile, LibraryRootFolder libraryRootFolder)
120 { 107 {
121 m_networkServersInfo = serversInfo; 108 m_networkServersInfo = serversInfo;
122 m_userProfileCacheService = new UserProfileCacheService(this, libraryRootFolder); 109 m_userProfileCacheService = new UserProfileCacheService(this, libraryRootFolder);
123 m_httpServer = httpServer;
124 } 110 }
125 111
126 #region Inventory 112 #region Inventory
diff --git a/OpenSim/Grid/UserServer/UserServerCommsManager.cs b/OpenSim/Grid/UserServer/UserServerCommsManager.cs
index 9adb3bc..7200836 100644
--- a/OpenSim/Grid/UserServer/UserServerCommsManager.cs
+++ b/OpenSim/Grid/UserServer/UserServerCommsManager.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Grid.UserServer
32 public class UserServerCommsManager : CommunicationsManager 32 public class UserServerCommsManager : CommunicationsManager
33 { 33 {
34 public UserServerCommsManager(IInterServiceInventoryServices interServiceInventoryService) 34 public UserServerCommsManager(IInterServiceInventoryServices interServiceInventoryService)
35 : base(null, null, null, false, null) 35 : base(null, null)
36 { 36 {
37 m_interServiceInventoryService = interServiceInventoryService; 37 m_interServiceInventoryService = interServiceInventoryService;
38 } 38 }
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index a42fd3d..671ea67 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -391,7 +391,7 @@ namespace OpenSim
391 scene.LoadPrimsFromStorage(regionInfo.originRegionID); 391 scene.LoadPrimsFromStorage(regionInfo.originRegionID);
392 392
393 // TODO : Try setting resource for region xstats here on scene 393 // TODO : Try setting resource for region xstats here on scene
394 scene.CommsManager.HttpServer.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); 394 MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo));
395 395
396 try 396 try
397 { 397 {
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
index 6767c32..0e7ab9b 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
@@ -50,12 +50,12 @@ namespace OpenSim.Region.Communications.Hypergrid
50 } 50 }
51 51
52 public HGCommunicationsGridMode( 52 public HGCommunicationsGridMode(
53 NetworkServersInfo serversInfo, BaseHttpServer httpServer, 53 NetworkServersInfo serversInfo,
54 IAssetCache assetCache, SceneManager sman, LibraryRootFolder libraryRootFolder) 54 SceneManager sman, LibraryRootFolder libraryRootFolder)
55 : base(serversInfo, httpServer, assetCache, false, libraryRootFolder) 55 : base(serversInfo, libraryRootFolder)
56 { 56 {
57 // From constructor at CommunicationsOGS1 57 // From constructor at CommunicationsOGS1
58 HGGridServices gridInterComms = new HGGridServicesGridMode(serversInfo, httpServer, assetCache, sman, m_userProfileCacheService); 58 HGGridServices gridInterComms = new HGGridServicesGridMode(serversInfo, sman, m_userProfileCacheService);
59 m_gridService = gridInterComms; 59 m_gridService = gridInterComms;
60 m_osw = gridInterComms; 60 m_osw = gridInterComms;
61 61
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
index f9c8075..3ea987c 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Region.Communications.Hypergrid
48 HGGridServices gridService, 48 HGGridServices gridService,
49 LibraryRootFolder libraryRootFolder, 49 LibraryRootFolder libraryRootFolder,
50 bool dumpAssetsToFile) 50 bool dumpAssetsToFile)
51 : base(serversInfo, httpServer, assetCache, dumpAssetsToFile, libraryRootFolder) 51 : base(serversInfo, libraryRootFolder)
52 { 52 {
53 LocalUserServices localUserService = 53 LocalUserServices localUserService =
54 new LocalUserServices( 54 new LocalUserServices(
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
index 58711e5..54cde0f 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
@@ -63,7 +63,6 @@ namespace OpenSim.Region.Communications.Hypergrid
63 63
64 public BaseHttpServer httpListener; 64 public BaseHttpServer httpListener;
65 public NetworkServersInfo serversInfo; 65 public NetworkServersInfo serversInfo;
66 public BaseHttpServer httpServer;
67 66
68 protected List<RegionInfo> m_regionsOnInstance = new List<RegionInfo>(); 67 protected List<RegionInfo> m_regionsOnInstance = new List<RegionInfo>();
69 68
@@ -76,7 +75,6 @@ namespace OpenSim.Region.Communications.Hypergrid
76 // This is key-ed on agent ID 75 // This is key-ed on agent ID
77 protected Dictionary<UUID, RegionInfo> m_knownRegions = new Dictionary<UUID, RegionInfo>(); 76 protected Dictionary<UUID, RegionInfo> m_knownRegions = new Dictionary<UUID, RegionInfo>();
78 77
79 protected IAssetCache m_assetcache;
80 protected UserProfileCacheService m_userProfileCache; 78 protected UserProfileCacheService m_userProfileCache;
81 protected SceneManager m_sceneman; 79 protected SceneManager m_sceneman;
82 80
@@ -112,18 +110,15 @@ namespace OpenSim.Region.Communications.Hypergrid
112 /// Contructor. Adds "expect_hg_user" and "check" xmlrpc method handlers 110 /// Contructor. Adds "expect_hg_user" and "check" xmlrpc method handlers
113 /// </summary> 111 /// </summary>
114 /// <param name="servers_info"></param> 112 /// <param name="servers_info"></param>
115 /// <param name="httpServe"></param> 113 public HGGridServices(NetworkServersInfo servers_info, SceneManager sman)
116 public HGGridServices(NetworkServersInfo servers_info, BaseHttpServer httpServe, IAssetCache asscache, SceneManager sman)
117 { 114 {
118 serversInfo = servers_info; 115 serversInfo = servers_info;
119 httpServer = httpServe;
120 m_assetcache = asscache;
121 m_sceneman = sman; 116 m_sceneman = sman;
122 117
123 random = new Random(); 118 random = new Random();
124 119
125 httpServer.AddXmlRPCHandler("link_region", LinkRegionRequest); 120 MainServer.Instance.AddXmlRPCHandler("link_region", LinkRegionRequest);
126 httpServer.AddXmlRPCHandler("expect_hg_user", ExpectHGUser); 121 MainServer.Instance.AddXmlRPCHandler("expect_hg_user", ExpectHGUser);
127 122
128 HGNetworkServersInfo.Init(servers_info.AssetURL, servers_info.InventoryURL, servers_info.UserURL); 123 HGNetworkServersInfo.Init(servers_info.AssetURL, servers_info.InventoryURL, servers_info.UserURL);
129 } 124 }
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
index 09a7fcc..5ce1e79 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
@@ -65,11 +65,11 @@ namespace OpenSim.Region.Communications.Hypergrid
65 set { m_remoteBackend.RegionLoginsEnabled = value; } 65 set { m_remoteBackend.RegionLoginsEnabled = value; }
66 } 66 }
67 67
68 public HGGridServicesGridMode(NetworkServersInfo servers_info, BaseHttpServer httpServe, 68 public HGGridServicesGridMode(NetworkServersInfo servers_info,
69 IAssetCache asscache, SceneManager sman, UserProfileCacheService userv) 69 SceneManager sman, UserProfileCacheService userv)
70 : base(servers_info, httpServe, asscache, sman) 70 : base(servers_info, sman)
71 { 71 {
72 m_remoteBackend = new OGS1GridServices(servers_info, httpServe); 72 m_remoteBackend = new OGS1GridServices(servers_info);
73 m_userProfileCache = userv; 73 m_userProfileCache = userv;
74 } 74 }
75 75
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
index e195853..828d0d9 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
@@ -77,12 +77,12 @@ namespace OpenSim.Region.Communications.Hypergrid
77 77
78 78
79 public HGGridServicesStandalone(NetworkServersInfo servers_info, BaseHttpServer httpServe, IAssetCache asscache, SceneManager sman) 79 public HGGridServicesStandalone(NetworkServersInfo servers_info, BaseHttpServer httpServe, IAssetCache asscache, SceneManager sman)
80 : base(servers_info, httpServe, asscache, sman) 80 : base(servers_info, sman)
81 { 81 {
82 //Respond to Grid Services requests 82 //Respond to Grid Services requests
83 httpServer.AddXmlRPCHandler("logoff_user", LogOffUser); 83 MainServer.Instance.AddXmlRPCHandler("logoff_user", LogOffUser);
84 httpServer.AddXmlRPCHandler("check", PingCheckReply); 84 MainServer.Instance.AddXmlRPCHandler("check", PingCheckReply);
85 httpServer.AddXmlRPCHandler("land_data", LandData); 85 MainServer.Instance.AddXmlRPCHandler("land_data", LandData);
86 86
87 } 87 }
88 88
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index ac3d64e..ceab75b 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -31,7 +31,6 @@ using OpenSim.Framework;
31using OpenSim.Framework.Communications; 31using OpenSim.Framework.Communications;
32using OpenSim.Framework.Communications.Cache; 32using OpenSim.Framework.Communications.Cache;
33using OpenSim.Framework.Communications.Osp; 33using OpenSim.Framework.Communications.Osp;
34using OpenSim.Framework.Servers.HttpServer;
35 34
36namespace OpenSim.Region.Communications.Local 35namespace OpenSim.Region.Communications.Local
37{ 36{
@@ -40,11 +39,8 @@ namespace OpenSim.Region.Communications.Local
40 public CommunicationsLocal( 39 public CommunicationsLocal(
41 ConfigSettings configSettings, 40 ConfigSettings configSettings,
42 NetworkServersInfo serversInfo, 41 NetworkServersInfo serversInfo,
43 BaseHttpServer httpServer, 42 LibraryRootFolder libraryRootFolder)
44 IAssetCache assetCache, 43 : base(serversInfo, libraryRootFolder)
45 LibraryRootFolder libraryRootFolder,
46 bool dumpAssetsToFile)
47 : base(serversInfo, httpServer, assetCache, dumpAssetsToFile, libraryRootFolder)
48 { 44 {
49 LocalInventoryService inventoryService = new LocalInventoryService(); 45 LocalInventoryService inventoryService = new LocalInventoryService();
50 List<IInventoryDataPlugin> plugins 46 List<IInventoryDataPlugin> plugins
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
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
index ad2c7aa..0c7882a 100644
--- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
@@ -103,8 +103,8 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
103 103
104 Caps caps 104 Caps caps
105 = new Caps( 105 = new Caps(
106 m_scene.AssetService, m_scene.CommsManager.HttpServer, m_scene.RegionInfo.ExternalHostName, 106 m_scene.AssetService, MainServer.Instance, m_scene.RegionInfo.ExternalHostName,
107 m_scene.CommsManager.HttpServer.Port, 107 MainServer.Instance.Port,
108 capsObjectPath, agentId, m_scene.DumpAssetsToFile, m_scene.RegionInfo.RegionName); 108 capsObjectPath, agentId, m_scene.DumpAssetsToFile, m_scene.RegionInfo.RegionName);
109 109
110 caps.RegisterHandlers(); 110 caps.RegisterHandlers();
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 52d0948..b6250a2 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -117,8 +117,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
117 { 117 {
118 if (m_scenes.Count == 0) 118 if (m_scenes.Count == 0)
119 { 119 {
120 scene.CommsManager.HttpServer.AddXmlRPCHandler("presence_update_bulk", processPresenceUpdateBulk); 120 MainServer.Instance.AddXmlRPCHandler("presence_update_bulk", processPresenceUpdateBulk);
121 scene.CommsManager.HttpServer.AddXmlRPCHandler("terminate_friend", processTerminateFriend); 121 MainServer.Instance.AddXmlRPCHandler("terminate_friend", processTerminateFriend);
122 m_friendLists.DefaultTTL = new TimeSpan(1, 0, 0); // store entries for one hour max 122 m_friendLists.DefaultTTL = new TimeSpan(1, 0, 0); // store entries for one hour max
123 m_initialScene = scene; 123 m_initialScene = scene;
124 } 124 }
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index 70fbcd4..5e7cf4b 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
68 { 68 {
69 if (m_Scenes.Count == 0) 69 if (m_Scenes.Count == 0)
70 { 70 {
71 scene.CommsManager.HttpServer.AddXmlRPCHandler( 71 MainServer.Instance.AddXmlRPCHandler(
72 "grid_instant_message", processXMLRPCGridInstantMessage); 72 "grid_instant_message", processXMLRPCGridInstantMessage);
73 } 73 }
74 74
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
index f98a9ff..81ea267 100644
--- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
@@ -226,7 +226,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
226 foreach (UUID ky in removeitems) 226 foreach (UUID ky in removeitems)
227 { 227 {
228 m_AvatarQueueUUIDMapping.Remove(ky); 228 m_AvatarQueueUUIDMapping.Remove(ky);
229 m_scene.CommsManager.HttpServer.RemoveHTTPHandler("","/CAPS/EQG/" + ky.ToString() + "/"); 229 MainServer.Instance.RemoveHTTPHandler("","/CAPS/EQG/" + ky.ToString() + "/");
230 } 230 }
231 231
232 } 232 }
@@ -315,7 +315,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
315 })); 315 }));
316 316
317 // This will persist this beyond the expiry of the caps handlers 317 // This will persist this beyond the expiry of the caps handlers
318 m_scene.CommsManager.HttpServer.AddHTTPHandler( 318 MainServer.Instance.AddHTTPHandler(
319 capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePath2); 319 capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePath2);
320 320
321 Random rnd = new Random(Environment.TickCount); 321 Random rnd = new Random(Environment.TickCount);
diff --git a/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs b/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs
index b900219..8c92727 100644
--- a/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs
+++ b/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs
@@ -124,7 +124,7 @@ namespace OpenSim.Region.CoreModules.Framework.Services
124// IAssetDataPlugin m_assetProvider 124// IAssetDataPlugin m_assetProvider
125// = ((AssetServerBase)m_scene.CommsManager.AssetCache.AssetServer).AssetProviderPlugin; 125// = ((AssetServerBase)m_scene.CommsManager.AssetCache.AssetServer).AssetProviderPlugin;
126 126
127 IHttpServer httpServer = m_scene.CommsManager.HttpServer; 127 IHttpServer httpServer = MainServer.Instance;
128 httpServer.AddXmlRPCHandler("simulator_data_request", XmlRpcSimulatorDataRequestMethod); 128 httpServer.AddXmlRPCHandler("simulator_data_request", XmlRpcSimulatorDataRequestMethod);
129 //m_httpServer.AddXmlRPCHandler("map_block", XmlRpcMapBlockMethod); 129 //m_httpServer.AddXmlRPCHandler("map_block", XmlRpcMapBlockMethod);
130 //m_httpServer.AddXmlRPCHandler("search_for_region_by_name", XmlRpcSearchForRegionMethod); 130 //m_httpServer.AddXmlRPCHandler("search_for_region_by_name", XmlRpcSearchForRegionMethod);
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
index 08e1ecd..a5894c6 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
@@ -100,7 +100,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
100 //TODO: fix casting. 100 //TODO: fix casting.
101 LibraryRootFolder rootFolder = m_firstScene.CommsManager.UserProfileCacheService.LibraryRoot as LibraryRootFolder; 101 LibraryRootFolder rootFolder = m_firstScene.CommsManager.UserProfileCacheService.LibraryRoot as LibraryRootFolder;
102 102
103 IHttpServer httpServer = m_firstScene.CommsManager.HttpServer; 103 IHttpServer httpServer = MainServer.Instance;
104 104
105 //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference 105 //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference
106 m_loginService 106 m_loginService
diff --git a/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs b/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs
index a20b5ba..0f2ba32 100644
--- a/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs
+++ b/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
89 if (m_settings.Configs["Startup"].GetBoolean("gridmode", false)) 89 if (m_settings.Configs["Startup"].GetBoolean("gridmode", false))
90 { 90 {
91 m_com = m_scenes[0].CommsManager; 91 m_com = m_scenes[0].CommsManager;
92 m_com.HttpServer.AddXmlRPCHandler("grid_message", GridWideMessage); 92 MainServer.Instance.AddXmlRPCHandler("grid_message", GridWideMessage);
93 } 93 }
94 } 94 }
95 95
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
index b357805..bcf20be 100644
--- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
@@ -143,8 +143,8 @@ namespace OpenSim.Region.CoreModules.InterGrid
143 { 143 {
144 if (m_scene.Count == 0) 144 if (m_scene.Count == 0)
145 { 145 {
146 scene.CommsManager.HttpServer.AddLLSDHandler("/agent/", ProcessAgentDomainMessage); 146 MainServer.Instance.AddLLSDHandler("/agent/", ProcessAgentDomainMessage);
147 scene.CommsManager.HttpServer.AddLLSDHandler("/", ProcessRegionDomainSeed); 147 MainServer.Instance.AddLLSDHandler("/", ProcessRegionDomainSeed);
148 try 148 try
149 { 149 {
150 ServicePointManager.ServerCertificateValidationCallback += customXertificateValidation; 150 ServicePointManager.ServerCertificateValidationCallback += customXertificateValidation;
@@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
169 // a zero length region name would conflict with are base region seed cap 169 // a zero length region name would conflict with are base region seed cap
170 if (!SceneListDuplicateCheck(scene.RegionInfo.RegionName) && scene.RegionInfo.RegionName.ToLower() != "agent" && scene.RegionInfo.RegionName.Length > 0) 170 if (!SceneListDuplicateCheck(scene.RegionInfo.RegionName) && scene.RegionInfo.RegionName.ToLower() != "agent" && scene.RegionInfo.RegionName.Length > 0)
171 { 171 {
172 scene.CommsManager.HttpServer.AddLLSDHandler( 172 MainServer.Instance.AddLLSDHandler(
173 "/" + HttpUtility.UrlPathEncode(scene.RegionInfo.RegionName.ToLower()), 173 "/" + HttpUtility.UrlPathEncode(scene.RegionInfo.RegionName.ToLower()),
174 ProcessRegionDomainSeed); 174 ProcessRegionDomainSeed);
175 } 175 }
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 5cb1f7d..50d3fbe 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
93 { 93 {
94 // There can only be one 94 // There can only be one
95 // 95 //
96 m_HttpServer = scene.CommsManager.HttpServer; 96 m_HttpServer = MainServer.Instance;
97 } 97 }
98 98
99 scene.RegisterModuleInterface<IUrlModule>(this); 99 scene.RegisterModuleInterface<IUrlModule>(this);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
index 7036588..3d7decc 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset
93 93
94 m_log.Info("[RegionAssetService]: Starting..."); 94 m_log.Info("[RegionAssetService]: Starting...");
95 95
96 Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer }; 96 Object[] args = new Object[] { m_Config, MainServer.Instance };
97 97
98 ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:AssetServiceConnector", args); 98 ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:AssetServiceConnector", args);
99 } 99 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs
index b3b4320..a991393 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/HGAuthServiceInConnectorModule.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication
94 if (!m_Registered) 94 if (!m_Registered)
95 { 95 {
96 m_Registered = true; 96 m_Registered = true;
97 new HGAuthServiceInConnector(m_Config, scene.CommsManager.HttpServer); 97 new HGAuthServiceInConnector(m_Config, MainServer.Instance);
98 98
99 //Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer }; 99 //Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer };
100 //ServerUtils.LoadPlugin<IAuthenticationService>("OpenSim.Server.Handlers.dll:HGAuthServiceInConnector", args); 100 //ServerUtils.LoadPlugin<IAuthenticationService>("OpenSim.Server.Handlers.dll:HGAuthServiceInConnector", args);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
index 480500a..0ed7464 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory
93 93
94 m_log.Info("[RegionInventoryService]: Starting..."); 94 m_log.Info("[RegionInventoryService]: Starting...");
95 95
96 Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer }; 96 Object[] args = new Object[] { m_Config, MainServer.Instance };
97 97
98 ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:InventoryServiceInConnector", args); 98 ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:InventoryServiceInConnector", args);
99 } 99 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
index a3b2440..213a769 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land
94 if (!m_Registered) 94 if (!m_Registered)
95 { 95 {
96 m_Registered = true; 96 m_Registered = true;
97 Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer, this, scene }; 97 Object[] args = new Object[] { m_Config, MainServer.Instance, this, scene };
98 ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:LandServiceInConnector", args); 98 ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:LandServiceInConnector", args);
99 } 99 }
100 100
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
index a6c2e7c..f283c89 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour
94 if (!m_Registered) 94 if (!m_Registered)
95 { 95 {
96 m_Registered = true; 96 m_Registered = true;
97 Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer, this, scene }; 97 Object[] args = new Object[] { m_Config, MainServer.Instance, this, scene };
98 ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:NeighbourServiceInConnector", args); 98 ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:NeighbourServiceInConnector", args);
99 } 99 }
100 100
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
index 151b455..9e7e10d 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation
93 93
94 m_log.Info("[SIM SERVICE]: Starting..."); 94 m_log.Info("[SIM SERVICE]: Starting...");
95 95
96 Object[] args = new Object[] { m_Config, scene.CommsManager.HttpServer, scene }; 96 Object[] args = new Object[] { m_Config, MainServer.Instance, scene };
97 97
98 ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:SimulationServiceInConnector", args); 98 ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:SimulationServiceInConnector", args);
99 } 99 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
index 05cc824..7f9167d 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
@@ -128,8 +128,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
128 128
129 protected virtual void AddHTTPHandlers() 129 protected virtual void AddHTTPHandlers()
130 { 130 {
131 m_aScene.CommsManager.HttpServer.AddHTTPHandler("/agent/", AgentHandler); 131 MainServer.Instance.AddHTTPHandler("/agent/", AgentHandler);
132 m_aScene.CommsManager.HttpServer.AddHTTPHandler("/object/", ObjectHandler); 132 MainServer.Instance.AddHTTPHandler("/object/", ObjectHandler);
133 } 133 }
134 134
135 #endregion /* IRegionModule */ 135 #endregion /* IRegionModule */
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 16c02a3..cf04fc8 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -144,8 +144,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
144 regionimage = regionimage.Replace("-", ""); 144 regionimage = regionimage.Replace("-", "");
145 m_log.Info("[WORLD MAP]: JPEG Map location: http://" + m_scene.RegionInfo.ExternalEndPoint.Address.ToString() + ":" + m_scene.RegionInfo.HttpPort.ToString() + "/index.php?method=" + regionimage); 145 m_log.Info("[WORLD MAP]: JPEG Map location: http://" + m_scene.RegionInfo.ExternalEndPoint.Address.ToString() + ":" + m_scene.RegionInfo.HttpPort.ToString() + "/index.php?method=" + regionimage);
146 146
147 m_scene.CommsManager.HttpServer.AddHTTPHandler(regionimage, OnHTTPGetMapImage); 147 MainServer.Instance.AddHTTPHandler(regionimage, OnHTTPGetMapImage);
148 m_scene.CommsManager.HttpServer.AddLLSDHandler( 148 MainServer.Instance.AddLLSDHandler(
149 "/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), HandleRemoteMapItemRequest); 149 "/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), HandleRemoteMapItemRequest);
150 150
151 m_scene.EventManager.OnRegisterCaps += OnRegisterCaps; 151 m_scene.EventManager.OnRegisterCaps += OnRegisterCaps;
@@ -166,9 +166,9 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
166 166
167 string regionimage = "regionImage" + m_scene.RegionInfo.RegionID.ToString(); 167 string regionimage = "regionImage" + m_scene.RegionInfo.RegionID.ToString();
168 regionimage = regionimage.Replace("-", ""); 168 regionimage = regionimage.Replace("-", "");
169 m_scene.CommsManager.HttpServer.RemoveLLSDHandler("/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), 169 MainServer.Instance.RemoveLLSDHandler("/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(),
170 HandleRemoteMapItemRequest); 170 HandleRemoteMapItemRequest);
171 m_scene.CommsManager.HttpServer.RemoveHTTPHandler("", regionimage); 171 MainServer.Instance.RemoveHTTPHandler("", regionimage);
172 } 172 }
173 173
174 public void OnRegisterCaps(UUID agentID, Caps caps) 174 public void OnRegisterCaps(UUID agentID, Caps caps)
diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
index ed5c9ec..964e4b9 100644
--- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
+++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
@@ -31,6 +31,7 @@ using System.Reflection;
31using System.Xml; 31using System.Xml;
32using log4net; 32using log4net;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework;
34using OpenSim.Framework.Capabilities; 35using OpenSim.Framework.Capabilities;
35using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
36using OpenSim.Framework.Servers.HttpServer; 37using OpenSim.Framework.Servers.HttpServer;
@@ -53,7 +54,7 @@ namespace OpenSim.Region.DataSnapshot
53 m_externalData = externalData; 54 m_externalData = externalData;
54 55
55 //Register HTTP handler 56 //Register HTTP handler
56 if (m_scene.CommsManager.HttpServer.AddHTTPHandler("collector", OnGetSnapshot)) 57 if (MainServer.Instance.AddHTTPHandler("collector", OnGetSnapshot))
57 { 58 {
58 m_log.Info("[DATASNAPSHOT]: Set up snapshot service"); 59 m_log.Info("[DATASNAPSHOT]: Set up snapshot service");
59 } 60 }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
index b17a7e1..0c696e3 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
@@ -90,7 +90,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
90 { 90 {
91 m_log.InfoFormat("[IRC-Bridge] Connecting region {0}", scene.RegionInfo.RegionName); 91 m_log.InfoFormat("[IRC-Bridge] Connecting region {0}", scene.RegionInfo.RegionName);
92 if (!String.IsNullOrEmpty(m_password)) 92 if (!String.IsNullOrEmpty(m_password))
93 scene.CommsManager.HttpServer.AddXmlRPCHandler("irc_admin", XmlRpcAdminMethod, false); 93 MainServer.Instance.AddXmlRPCHandler("irc_admin", XmlRpcAdminMethod, false);
94 m_region = new RegionState(scene, m_config); 94 m_region = new RegionState(scene, m_config);
95 lock (m_regions) m_regions.Add(m_region); 95 lock (m_regions) m_regions.Add(m_region);
96 m_region.Open(); 96 m_region.Open();
@@ -121,7 +121,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
121 return; 121 return;
122 122
123 if (!String.IsNullOrEmpty(m_password)) 123 if (!String.IsNullOrEmpty(m_password))
124 scene.CommsManager.HttpServer.RemoveXmlRPCHandler("irc_admin"); 124 MainServer.Instance.RemoveXmlRPCHandler("irc_admin");
125 125
126 m_region.Close(); 126 m_region.Close();
127 127
diff --git a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
index 6ef30c4..96b6888 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
144 { 144 {
145 if (!m_enabled) return; 145 if (!m_enabled) return;
146 146
147 scene.CommsManager.HttpServer.AddXmlRPCHandler("concierge_update_welcome", XmlRpcUpdateWelcomeMethod, false); 147 MainServer.Instance.AddXmlRPCHandler("concierge_update_welcome", XmlRpcUpdateWelcomeMethod, false);
148 148
149 lock (m_syncy) 149 lock (m_syncy)
150 { 150 {
@@ -176,7 +176,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
176 { 176 {
177 if (!m_enabled) return; 177 if (!m_enabled) return;
178 178
179 scene.CommsManager.HttpServer.RemoveXmlRPCHandler("concierge_update_welcome"); 179 MainServer.Instance.RemoveXmlRPCHandler("concierge_update_welcome");
180 180
181 lock (m_syncy) 181 lock (m_syncy)
182 { 182 {
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 469ac2f..5c562ac 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -170,31 +170,31 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
170 // - signout: viv_signout.php 170 // - signout: viv_signout.php
171 if (UseProxy) 171 if (UseProxy)
172 { 172 {
173 scene.CommsManager.HttpServer.AddHTTPHandler(String.Format("{0}/", m_freeSwitchAPIPrefix), 173 MainServer.Instance.AddHTTPHandler(String.Format("{0}/", m_freeSwitchAPIPrefix),
174 ForwardProxyRequest); 174 ForwardProxyRequest);
175 } 175 }
176 else 176 else
177 { 177 {
178 scene.CommsManager.HttpServer.AddHTTPHandler(String.Format("{0}/viv_get_prelogin.php", m_freeSwitchAPIPrefix), 178 MainServer.Instance.AddHTTPHandler(String.Format("{0}/viv_get_prelogin.php", m_freeSwitchAPIPrefix),
179 FreeSwitchSLVoiceGetPreloginHTTPHandler); 179 FreeSwitchSLVoiceGetPreloginHTTPHandler);
180 180
181 // RestStreamHandler h = new 181 // RestStreamHandler h = new
182 // RestStreamHandler("GET", 182 // RestStreamHandler("GET",
183 // String.Format("{0}/viv_get_prelogin.php", m_freeSwitchAPIPrefix), FreeSwitchSLVoiceGetPreloginHTTPHandler); 183 // String.Format("{0}/viv_get_prelogin.php", m_freeSwitchAPIPrefix), FreeSwitchSLVoiceGetPreloginHTTPHandler);
184 // scene.CommsManager.HttpServer.AddStreamHandler(h); 184 // MainServer.Instance.AddStreamHandler(h);
185 185
186 186
187 187
188 scene.CommsManager.HttpServer.AddHTTPHandler(String.Format("{0}/viv_signin.php", m_freeSwitchAPIPrefix), 188 MainServer.Instance.AddHTTPHandler(String.Format("{0}/viv_signin.php", m_freeSwitchAPIPrefix),
189 FreeSwitchSLVoiceSigninHTTPHandler); 189 FreeSwitchSLVoiceSigninHTTPHandler);
190 190
191 // set up http request handlers to provide 191 // set up http request handlers to provide
192 // on-demand FreeSwitch configuration to 192 // on-demand FreeSwitch configuration to
193 // FreeSwitch's mod_curl_xml 193 // FreeSwitch's mod_curl_xml
194 scene.CommsManager.HttpServer.AddHTTPHandler(String.Format("{0}/freeswitch-config", m_freeSwitchAPIPrefix), 194 MainServer.Instance.AddHTTPHandler(String.Format("{0}/freeswitch-config", m_freeSwitchAPIPrefix),
195 FreeSwitchConfigHTTPHandler); 195 FreeSwitchConfigHTTPHandler);
196 196
197 scene.CommsManager.HttpServer.AddHTTPHandler(String.Format("{0}/viv_buddy.php", m_freeSwitchAPIPrefix), 197 MainServer.Instance.AddHTTPHandler(String.Format("{0}/viv_buddy.php", m_freeSwitchAPIPrefix),
198 FreeSwitchSLVoiceBuddyHTTPHandler); 198 FreeSwitchSLVoiceBuddyHTTPHandler);
199 } 199 }
200 200
diff --git a/OpenSim/Region/ReplaceableModules/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/ReplaceableModules/MoneyModule/SampleMoneyModule.cs
index 6251293..c4fd4bc 100644
--- a/OpenSim/Region/ReplaceableModules/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/ReplaceableModules/MoneyModule/SampleMoneyModule.cs
@@ -124,7 +124,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
124 if (m_enabled) 124 if (m_enabled)
125 { 125 {
126 scene.RegisterModuleInterface<IMoneyModule>(this); 126 scene.RegisterModuleInterface<IMoneyModule>(this);
127 IHttpServer httpServer = scene.CommsManager.HttpServer; 127 IHttpServer httpServer = MainServer.Instance;
128 128
129 lock (m_scenel) 129 lock (m_scenel)
130 { 130 {
diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs
index 4f6fcce..0807607 100644
--- a/OpenSim/Region/UserStatistics/WebStatsModule.cs
+++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs
@@ -127,8 +127,8 @@ namespace OpenSim.Region.UserStatistics
127 //// 127 ////
128 128
129 129
130 scene.CommsManager.HttpServer.AddHTTPHandler("/SStats/", HandleStatsRequest); 130 MainServer.Instance.AddHTTPHandler("/SStats/", HandleStatsRequest);
131 scene.CommsManager.HttpServer.AddHTTPHandler("/CAPS/VS/", HandleUnknownCAPSRequest); 131 MainServer.Instance.AddHTTPHandler("/CAPS/VS/", HandleUnknownCAPSRequest);
132 } 132 }
133 133
134 m_scene.Add(scene); 134 m_scene.Add(scene);
@@ -236,7 +236,7 @@ namespace OpenSim.Region.UserStatistics
236 } 236 }
237 else 237 else
238 { 238 {
239 strOut = m_scene[0].CommsManager.HttpServer.GetHTTP404(""); 239 strOut = MainServer.Instance.GetHTTP404("");
240 } 240 }
241 241
242 242
diff --git a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
index eb83ee6..87751a4 100644
--- a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
+++ b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Tests.Common.Mock
55 } 55 }
56 56
57 public TestCommunicationsManager(NetworkServersInfo serversInfo) 57 public TestCommunicationsManager(NetworkServersInfo serversInfo)
58 : base(serversInfo, new BaseHttpServer(666), null, false, null) 58 : base(serversInfo, null)
59 { 59 {
60 LocalInventoryService lis = new LocalInventoryService(); 60 LocalInventoryService lis = new LocalInventoryService();
61 m_inventoryDataPlugin = new TestInventoryDataPlugin(); 61 m_inventoryDataPlugin = new TestInventoryDataPlugin();