From bc5018b3c6dc05013cbfd4a1febddce8c29f16be Mon Sep 17 00:00:00 2001 From: MW Date: Tue, 24 Feb 2009 14:12:25 +0000 Subject: Updated MessagingServer to use OpenSim.Grid.Framework --- OpenSim/Grid/MessagingServer/IMessageRegionService.cs | 3 ++- OpenSim/Grid/MessagingServer/IMessageUserServerService.cs | 3 ++- OpenSim/Grid/MessagingServer/IUGAIMCore.cs | 3 ++- OpenSim/Grid/MessagingServer/Main.cs | 1 + OpenSim/Grid/MessagingServer/MessageRegionModule.cs | 1 + OpenSim/Grid/MessagingServer/MessageService.cs | 1 + OpenSim/Grid/MessagingServer/MessageUserServerModule.cs | 1 + OpenSim/Grid/MessagingServer/XMPPHTTPService.cs | 4 ++-- 8 files changed, 12 insertions(+), 5 deletions(-) (limited to 'OpenSim/Grid') diff --git a/OpenSim/Grid/MessagingServer/IMessageRegionService.cs b/OpenSim/Grid/MessagingServer/IMessageRegionService.cs index e203c98..cc410ae 100644 --- a/OpenSim/Grid/MessagingServer/IMessageRegionService.cs +++ b/OpenSim/Grid/MessagingServer/IMessageRegionService.cs @@ -30,9 +30,10 @@ using OpenSim.Data; namespace OpenSim.Grid.MessagingServer { + /* public interface IMessageRegionService { int ClearRegionCache(); RegionProfileData GetRegionInfo(ulong regionhandle); - } + }*/ } diff --git a/OpenSim/Grid/MessagingServer/IMessageUserServerService.cs b/OpenSim/Grid/MessagingServer/IMessageUserServerService.cs index 2abbc41..7647117 100644 --- a/OpenSim/Grid/MessagingServer/IMessageUserServerService.cs +++ b/OpenSim/Grid/MessagingServer/IMessageUserServerService.cs @@ -28,8 +28,9 @@ using System; namespace OpenSim.Grid.MessagingServer { + /* public interface IMessageUserServerService { bool SendToUserServer(System.Collections.Hashtable request, string method); - } + }*/ } diff --git a/OpenSim/Grid/MessagingServer/IUGAIMCore.cs b/OpenSim/Grid/MessagingServer/IUGAIMCore.cs index 4428205..158c463 100644 --- a/OpenSim/Grid/MessagingServer/IUGAIMCore.cs +++ b/OpenSim/Grid/MessagingServer/IUGAIMCore.cs @@ -32,11 +32,12 @@ using OpenSim.Framework.Servers; namespace OpenSim.Grid.MessagingServer { + /* public interface IUGAIMCore { T Get(); void RegisterInterface(T iface); bool TryGet(out T iface); BaseHttpServer GetHttpServer(); - } + }*/ } diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs index e64d0ca..43d1af9 100644 --- a/OpenSim/Grid/MessagingServer/Main.cs +++ b/OpenSim/Grid/MessagingServer/Main.cs @@ -34,6 +34,7 @@ using log4net.Config; using OpenSim.Framework; using OpenSim.Framework.Console; using OpenSim.Framework.Servers; +using OpenSim.Grid.Framework; namespace OpenSim.Grid.MessagingServer { diff --git a/OpenSim/Grid/MessagingServer/MessageRegionModule.cs b/OpenSim/Grid/MessagingServer/MessageRegionModule.cs index a2a7ade..063774c 100644 --- a/OpenSim/Grid/MessagingServer/MessageRegionModule.cs +++ b/OpenSim/Grid/MessagingServer/MessageRegionModule.cs @@ -37,6 +37,7 @@ using Nwc.XmlRpc; using OpenMetaverse; using OpenSim.Data; using OpenSim.Framework; +using OpenSim.Grid.Framework; using Timer = System.Timers.Timer; namespace OpenSim.Grid.MessagingServer diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs index 75fb969..a301732 100644 --- a/OpenSim/Grid/MessagingServer/MessageService.cs +++ b/OpenSim/Grid/MessagingServer/MessageService.cs @@ -37,6 +37,7 @@ using Nwc.XmlRpc; using OpenMetaverse; using OpenSim.Data; using OpenSim.Framework; +using OpenSim.Grid.Framework; using Timer=System.Timers.Timer; namespace OpenSim.Grid.MessagingServer diff --git a/OpenSim/Grid/MessagingServer/MessageUserServerModule.cs b/OpenSim/Grid/MessagingServer/MessageUserServerModule.cs index c6bf9e7..a97107c 100644 --- a/OpenSim/Grid/MessagingServer/MessageUserServerModule.cs +++ b/OpenSim/Grid/MessagingServer/MessageUserServerModule.cs @@ -37,6 +37,7 @@ using Nwc.XmlRpc; using OpenMetaverse; using OpenSim.Data; using OpenSim.Framework; +using OpenSim.Grid.Framework; using Timer = System.Timers.Timer; namespace OpenSim.Grid.MessagingServer diff --git a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs index 87647cd..395c4bf 100644 --- a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs +++ b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs @@ -33,7 +33,7 @@ using OpenMetaverse; using OpenSim.Framework.Servers; namespace OpenSim.Grid.MessagingServer -{ +{/* public class XMPPHTTPStreamHandler : BaseStreamHandler { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); @@ -106,5 +106,5 @@ namespace OpenSim.Grid.MessagingServer } - } + }*/ } -- cgit v1.1