diff options
Renamed IUGAIMCore to IGridServiceCore, still not really happy with this name as it could be confused with the Grid Server namespace or with the IGridService in the region servers.
Diffstat (limited to 'OpenSim/Grid/MessagingServer.Modules')
3 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs b/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs index 7002a2e..b751d37 100644 --- a/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs +++ b/OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs | |||
@@ -50,12 +50,12 @@ namespace OpenSim.Grid.MessagingServer.Modules | |||
50 | 50 | ||
51 | private IMessageUserServerService m_userServerModule; | 51 | private IMessageUserServerService m_userServerModule; |
52 | 52 | ||
53 | private IUGAIMCore m_messageCore; | 53 | private IGridServiceCore m_messageCore; |
54 | 54 | ||
55 | // a dictionary of all current regions this server knows about | 55 | // a dictionary of all current regions this server knows about |
56 | private Dictionary<ulong, RegionProfileData> m_regionInfoCache = new Dictionary<ulong, RegionProfileData>(); | 56 | private Dictionary<ulong, RegionProfileData> m_regionInfoCache = new Dictionary<ulong, RegionProfileData>(); |
57 | 57 | ||
58 | public MessageRegionModule(MessageServerConfig config, IUGAIMCore messageCore) | 58 | public MessageRegionModule(MessageServerConfig config, IGridServiceCore messageCore) |
59 | { | 59 | { |
60 | m_cfg = config; | 60 | m_cfg = config; |
61 | m_messageCore = messageCore; | 61 | m_messageCore = messageCore; |
diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs index e79e5b4..0a37bb5 100644 --- a/OpenSim/Grid/MessagingServer.Modules/MessageService.cs +++ b/OpenSim/Grid/MessagingServer.Modules/MessageService.cs | |||
@@ -49,7 +49,7 @@ namespace OpenSim.Grid.MessagingServer.Modules | |||
49 | private MessageServerConfig m_cfg; | 49 | private MessageServerConfig m_cfg; |
50 | private UserDataBaseService m_userDataBaseService; | 50 | private UserDataBaseService m_userDataBaseService; |
51 | 51 | ||
52 | private IUGAIMCore m_messageCore; | 52 | private IGridServiceCore m_messageCore; |
53 | 53 | ||
54 | private IMessageUserServerService m_userServerModule; | 54 | private IMessageUserServerService m_userServerModule; |
55 | private IMessageRegionLookup m_regionModule; | 55 | private IMessageRegionLookup m_regionModule; |
@@ -57,7 +57,7 @@ namespace OpenSim.Grid.MessagingServer.Modules | |||
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>(); |
59 | 59 | ||
60 | public MessageService(MessageServerConfig cfg, IUGAIMCore messageCore, UserDataBaseService userDataBaseService) | 60 | public MessageService(MessageServerConfig cfg, IGridServiceCore messageCore, UserDataBaseService userDataBaseService) |
61 | { | 61 | { |
62 | m_cfg = cfg; | 62 | m_cfg = cfg; |
63 | m_messageCore = messageCore; | 63 | m_messageCore = messageCore; |
diff --git a/OpenSim/Grid/MessagingServer.Modules/MessageUserServerModule.cs b/OpenSim/Grid/MessagingServer.Modules/MessageUserServerModule.cs index e153c39..f4d5792 100644 --- a/OpenSim/Grid/MessagingServer.Modules/MessageUserServerModule.cs +++ b/OpenSim/Grid/MessagingServer.Modules/MessageUserServerModule.cs | |||
@@ -48,11 +48,11 @@ namespace OpenSim.Grid.MessagingServer.Modules | |||
48 | 48 | ||
49 | private MessageServerConfig m_cfg; | 49 | private MessageServerConfig m_cfg; |
50 | 50 | ||
51 | private IUGAIMCore m_messageCore; | 51 | private IGridServiceCore m_messageCore; |
52 | 52 | ||
53 | private Timer reconnectTimer = new Timer(300000); // 5 mins | 53 | private Timer reconnectTimer = new Timer(300000); // 5 mins |
54 | 54 | ||
55 | public MessageUserServerModule(MessageServerConfig config, IUGAIMCore messageCore) | 55 | public MessageUserServerModule(MessageServerConfig config, IGridServiceCore messageCore) |
56 | { | 56 | { |
57 | m_cfg = config; | 57 | m_cfg = config; |
58 | m_messageCore = messageCore; | 58 | m_messageCore = messageCore; |