diff options
author | MW | 2009-02-25 18:33:15 +0000 |
---|---|---|
committer | MW | 2009-02-25 18:33:15 +0000 |
commit | 4db232763f578048c3339e6a60fe801cc3853b3d (patch) | |
tree | c43b1442bcf1893fb83894873ddfdacdee5a5130 /OpenSim/Grid/MessagingServer.Modules | |
parent | * Fix my own unit test (diff) | |
download | opensim-SC-4db232763f578048c3339e6a60fe801cc3853b3d.zip opensim-SC-4db232763f578048c3339e6a60fe801cc3853b3d.tar.gz opensim-SC-4db232763f578048c3339e6a60fe801cc3853b3d.tar.bz2 opensim-SC-4db232763f578048c3339e6a60fe801cc3853b3d.tar.xz |
More refactoring of the Grid, User and Messaging servers.
Diffstat (limited to 'OpenSim/Grid/MessagingServer.Modules')
-rw-r--r-- | OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs | 8 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer.Modules/MessageService.cs | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs b/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs index 7b3edfb..7002a2e 100644 --- a/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs +++ b/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -42,7 +42,7 @@ using Timer = System.Timers.Timer; | |||
42 | 42 | ||
43 | namespace OpenSim.Grid.MessagingServer.Modules | 43 | namespace OpenSim.Grid.MessagingServer.Modules |
44 | { | 44 | { |
45 | public class MessageRegionModule : IMessageRegionService | 45 | public class MessageRegionModule : IMessageRegionLookup |
46 | { | 46 | { |
47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
48 | 48 | ||
@@ -63,7 +63,7 @@ namespace OpenSim.Grid.MessagingServer.Modules | |||
63 | 63 | ||
64 | public void Initialise() | 64 | public void Initialise() |
65 | { | 65 | { |
66 | m_messageCore.RegisterInterface<IMessageRegionService>(this); | 66 | m_messageCore.RegisterInterface<IMessageRegionLookup>(this); |
67 | } | 67 | } |
68 | 68 | ||
69 | public void PostInitialise() | 69 | public void PostInitialise() |
@@ -210,4 +210,4 @@ namespace OpenSim.Grid.MessagingServer.Modules | |||
210 | } | 210 | } |
211 | 211 | ||
212 | } | 212 | } |
213 | } | 213 | } \ No newline at end of file |
diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs index c76f332..e79e5b4 100644 --- a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs +++ b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs | |||
@@ -52,7 +52,7 @@ namespace OpenSim.Grid.MessagingServer.Modules | |||
52 | private IUGAIMCore m_messageCore; | 52 | private IUGAIMCore m_messageCore; |
53 | 53 | ||
54 | private IMessageUserServerService m_userServerModule; | 54 | private IMessageUserServerService m_userServerModule; |
55 | private IMessageRegionService m_regionModule; | 55 | private IMessageRegionLookup m_regionModule; |
56 | 56 | ||
57 | // a dictionary of all current presences this server knows about | 57 | // a dictionary of all current presences this server knows about |
58 | private Dictionary<UUID, UserPresenceData> m_presences = new Dictionary<UUID,UserPresenceData>(); | 58 | private Dictionary<UUID, UserPresenceData> m_presences = new Dictionary<UUID,UserPresenceData>(); |
@@ -82,8 +82,8 @@ namespace OpenSim.Grid.MessagingServer.Modules | |||
82 | m_userServerModule = messageUserServer; | 82 | m_userServerModule = messageUserServer; |
83 | } | 83 | } |
84 | 84 | ||
85 | IMessageRegionService messageRegion; | 85 | IMessageRegionLookup messageRegion; |
86 | if (m_messageCore.TryGet<IMessageRegionService>(out messageRegion)) | 86 | if (m_messageCore.TryGet<IMessageRegionLookup>(out messageRegion)) |
87 | { | 87 | { |
88 | m_regionModule = messageRegion; | 88 | m_regionModule = messageRegion; |
89 | } | 89 | } |