diff options
author | MW | 2009-02-24 14:12:25 +0000 |
---|---|---|
committer | MW | 2009-02-24 14:12:25 +0000 |
commit | bc5018b3c6dc05013cbfd4a1febddce8c29f16be (patch) | |
tree | 80f334582aa66f74fe01477fc8ebc0d900e03f4d /OpenSim/Grid/MessagingServer | |
parent | Some cleaning up in the MesssagingServer and GridServer. (diff) | |
download | opensim-SC-bc5018b3c6dc05013cbfd4a1febddce8c29f16be.zip opensim-SC-bc5018b3c6dc05013cbfd4a1febddce8c29f16be.tar.gz opensim-SC-bc5018b3c6dc05013cbfd4a1febddce8c29f16be.tar.bz2 opensim-SC-bc5018b3c6dc05013cbfd4a1febddce8c29f16be.tar.xz |
Updated MessagingServer to use OpenSim.Grid.Framework
Diffstat (limited to '')
8 files changed, 12 insertions, 5 deletions
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; | |||
30 | 30 | ||
31 | namespace OpenSim.Grid.MessagingServer | 31 | namespace OpenSim.Grid.MessagingServer |
32 | { | 32 | { |
33 | /* | ||
33 | public interface IMessageRegionService | 34 | public interface IMessageRegionService |
34 | { | 35 | { |
35 | int ClearRegionCache(); | 36 | int ClearRegionCache(); |
36 | RegionProfileData GetRegionInfo(ulong regionhandle); | 37 | RegionProfileData GetRegionInfo(ulong regionhandle); |
37 | } | 38 | }*/ |
38 | } | 39 | } |
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 @@ | |||
28 | using System; | 28 | using System; |
29 | namespace OpenSim.Grid.MessagingServer | 29 | namespace OpenSim.Grid.MessagingServer |
30 | { | 30 | { |
31 | /* | ||
31 | public interface IMessageUserServerService | 32 | public interface IMessageUserServerService |
32 | { | 33 | { |
33 | bool SendToUserServer(System.Collections.Hashtable request, string method); | 34 | bool SendToUserServer(System.Collections.Hashtable request, string method); |
34 | } | 35 | }*/ |
35 | } | 36 | } |
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; | |||
32 | 32 | ||
33 | namespace OpenSim.Grid.MessagingServer | 33 | namespace OpenSim.Grid.MessagingServer |
34 | { | 34 | { |
35 | /* | ||
35 | public interface IUGAIMCore | 36 | public interface IUGAIMCore |
36 | { | 37 | { |
37 | T Get<T>(); | 38 | T Get<T>(); |
38 | void RegisterInterface<T>(T iface); | 39 | void RegisterInterface<T>(T iface); |
39 | bool TryGet<T>(out T iface); | 40 | bool TryGet<T>(out T iface); |
40 | BaseHttpServer GetHttpServer(); | 41 | BaseHttpServer GetHttpServer(); |
41 | } | 42 | }*/ |
42 | } | 43 | } |
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; | |||
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Console; | 35 | using OpenSim.Framework.Console; |
36 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
37 | using OpenSim.Grid.Framework; | ||
37 | 38 | ||
38 | namespace OpenSim.Grid.MessagingServer | 39 | namespace OpenSim.Grid.MessagingServer |
39 | { | 40 | { |
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; | |||
37 | using OpenMetaverse; | 37 | using OpenMetaverse; |
38 | using OpenSim.Data; | 38 | using OpenSim.Data; |
39 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
40 | using OpenSim.Grid.Framework; | ||
40 | using Timer = System.Timers.Timer; | 41 | using Timer = System.Timers.Timer; |
41 | 42 | ||
42 | namespace OpenSim.Grid.MessagingServer | 43 | 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; | |||
37 | using OpenMetaverse; | 37 | using OpenMetaverse; |
38 | using OpenSim.Data; | 38 | using OpenSim.Data; |
39 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
40 | using OpenSim.Grid.Framework; | ||
40 | using Timer=System.Timers.Timer; | 41 | using Timer=System.Timers.Timer; |
41 | 42 | ||
42 | namespace OpenSim.Grid.MessagingServer | 43 | 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; | |||
37 | using OpenMetaverse; | 37 | using OpenMetaverse; |
38 | using OpenSim.Data; | 38 | using OpenSim.Data; |
39 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
40 | using OpenSim.Grid.Framework; | ||
40 | using Timer = System.Timers.Timer; | 41 | using Timer = System.Timers.Timer; |
41 | 42 | ||
42 | namespace OpenSim.Grid.MessagingServer | 43 | 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; | |||
33 | using OpenSim.Framework.Servers; | 33 | using OpenSim.Framework.Servers; |
34 | 34 | ||
35 | namespace OpenSim.Grid.MessagingServer | 35 | namespace OpenSim.Grid.MessagingServer |
36 | { | 36 | {/* |
37 | public class XMPPHTTPStreamHandler : BaseStreamHandler | 37 | public class XMPPHTTPStreamHandler : BaseStreamHandler |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
@@ -106,5 +106,5 @@ namespace OpenSim.Grid.MessagingServer | |||
106 | 106 | ||
107 | } | 107 | } |
108 | 108 | ||
109 | } | 109 | }*/ |
110 | } | 110 | } |