From 03ff84426f2cfeb799c39fa00c74377712ea4c58 Mon Sep 17 00:00:00 2001
From: MW
Date: Mon, 23 Feb 2009 19:38:36 +0000
Subject: more refactoring of the Grid server, to separate them into modules
---
OpenSim/Grid/GridServer/GridXmlRpcModule.cs | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
(limited to 'OpenSim/Grid/GridServer/GridXmlRpcModule.cs')
diff --git a/OpenSim/Grid/GridServer/GridXmlRpcModule.cs b/OpenSim/Grid/GridServer/GridXmlRpcModule.cs
index 8998b55..874b57f 100644
--- a/OpenSim/Grid/GridServer/GridXmlRpcModule.cs
+++ b/OpenSim/Grid/GridServer/GridXmlRpcModule.cs
@@ -50,6 +50,7 @@ namespace OpenSim.Grid.GridServer
protected GridConfig m_config;
+ protected IGridMessagingModule m_messagingServerMapper;
///
/// Used to notify old regions as to which OpenSim version to upgrade to
///
@@ -78,7 +79,11 @@ namespace OpenSim.Grid.GridServer
public void PostInitialise()
{
-
+ IGridMessagingModule messagingModule;
+ if (m_gridCore.TryGet(out messagingModule))
+ {
+ m_messagingServerMapper = messagingModule;
+ }
}
public void RegisterHandlers()
@@ -391,10 +396,12 @@ namespace OpenSim.Grid.GridServer
responseData["messageserver_count"] = 0;
- IGridMessagingModule messagingModule;
- if (m_gridCore.TryGet(out messagingModule))
+ // IGridMessagingModule messagingModule;
+ // if (m_gridCore.TryGet(out messagingModule))
+ //{
+ if(m_messagingServerMapper != null)
{
- List messageServers = messagingModule.MessageServers;
+ List messageServers = m_messagingServerMapper.MessageServers;
responseData["messageserver_count"] = messageServers.Count;
for (int i = 0; i < messageServers.Count; i++)
--
cgit v1.1