Remove all references to HttpServer from CommsManager (all incarnations)

Change all uses of the HttpServer properties to use the new singleton

2 files changed, 3 insertions, 3 deletions

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
             {
                 if (m_scenes.Count == 0)
                 {
-                    scene.CommsManager.HttpServer.AddXmlRPCHandler("presence_update_bulk", processPresenceUpdateBulk);
-                    scene.CommsManager.HttpServer.AddXmlRPCHandler("terminate_friend", processTerminateFriend);
+                    MainServer.Instance.AddXmlRPCHandler("presence_update_bulk", processPresenceUpdateBulk);
+                    MainServer.Instance.AddXmlRPCHandler("terminate_friend", processTerminateFriend);
                     m_friendLists.DefaultTTL = new TimeSpan(1, 0, 0);  // store entries for one hour max
                     m_initialScene = scene;
                 }
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
             {
                 if (m_Scenes.Count == 0)
                 {
-                    scene.CommsManager.HttpServer.AddXmlRPCHandler(
+                    MainServer.Instance.AddXmlRPCHandler(
                         "grid_instant_message", processXMLRPCGridInstantMessage);
                 }