More refactoring of the Grid, User and Messaging servers.

2 files changed, 6 insertions, 6 deletions

diff --git a/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs b/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs
index ee38310..1d2c529 100644
--- a/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs
+++ b/OpenSim/Grid/GridServer.Modules/GridMessagingModule.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -38,7 +38,7 @@ using OpenSim.Grid.Framework;
 
 namespace OpenSim.Grid.GridServer.Modules
 {
-    public class GridMessagingModule : IGridMessagingMapper
+    public class GridMessagingModule : IMessagingServerDiscovery
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -68,7 +68,7 @@ namespace OpenSim.Grid.GridServer.Modules
             m_gridCore = gridCore;
             m_config = config;
 
-            m_gridCore.RegisterInterface<IGridMessagingMapper>(this);
+            m_gridCore.RegisterInterface<IMessagingServerDiscovery>(this);
 
             RegisterHandlers();
         }
diff --git a/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs b/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs
index 292ce0d..62101e5 100644
--- a/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs
+++ b/OpenSim/Grid/GridServer.Modules/GridXmlRpcModule.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Grid.GridServer.Modules
 
         protected GridConfig m_config;
 
-        protected IGridMessagingMapper m_messagingServerMapper;
+        protected IMessagingServerDiscovery m_messagingServerMapper;
         /// <value>
         /// Used to notify old regions as to which OpenSim version to upgrade to
         /// </value>
@@ -80,8 +80,8 @@ namespace OpenSim.Grid.GridServer.Modules
 
         public void PostInitialise()
         {
-            IGridMessagingMapper messagingModule;
-            if (m_gridCore.TryGet<IGridMessagingMapper>(out messagingModule))
+            IMessagingServerDiscovery messagingModule;
+            if (m_gridCore.TryGet<IMessagingServerDiscovery>(out messagingModule))
             {
                 m_messagingServerMapper = messagingModule;
             }