diff options
Diffstat (limited to 'OpenSim/Grid/MessagingServer/MessageService.cs')
-rw-r--r-- | OpenSim/Grid/MessagingServer/MessageService.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs index 7a4a47f..36f8b91 100644 --- a/OpenSim/Grid/MessagingServer/MessageService.cs +++ b/OpenSim/Grid/MessagingServer/MessageService.cs | |||
@@ -29,13 +29,15 @@ using System; | |||
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Net; | 31 | using System.Net; |
32 | using System.Threading; | ||
33 | using System.Reflection; | 32 | using System.Reflection; |
34 | using OpenMetaverse; | 33 | using System.Threading; |
34 | using System.Timers; | ||
35 | using log4net; | 35 | using log4net; |
36 | using Nwc.XmlRpc; | 36 | using Nwc.XmlRpc; |
37 | using OpenMetaverse; | ||
37 | using OpenSim.Data; | 38 | using OpenSim.Data; |
38 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
40 | using Timer=System.Timers.Timer; | ||
39 | 41 | ||
40 | namespace OpenSim.Grid.MessagingServer | 42 | namespace OpenSim.Grid.MessagingServer |
41 | { | 43 | { |
@@ -52,7 +54,7 @@ namespace OpenSim.Grid.MessagingServer | |||
52 | // a dictionary of all current regions this server knows about | 54 | // a dictionary of all current regions this server knows about |
53 | private Dictionary<ulong, RegionProfileData> m_regionInfoCache = new Dictionary<ulong,RegionProfileData>(); | 55 | private Dictionary<ulong, RegionProfileData> m_regionInfoCache = new Dictionary<ulong,RegionProfileData>(); |
54 | 56 | ||
55 | private System.Timers.Timer reconnectTimer = new System.Timers.Timer(300000); // 5 mins | 57 | private Timer reconnectTimer = new Timer(300000); // 5 mins |
56 | 58 | ||
57 | public MessageService(MessageServerConfig cfg) | 59 | public MessageService(MessageServerConfig cfg) |
58 | { | 60 | { |
@@ -502,7 +504,7 @@ namespace OpenSim.Grid.MessagingServer | |||
502 | return regionProfile; | 504 | return regionProfile; |
503 | } | 505 | } |
504 | 506 | ||
505 | public void registerWithUserServer(object sender, System.Timers.ElapsedEventArgs e) | 507 | public void registerWithUserServer(object sender, ElapsedEventArgs e) |
506 | { | 508 | { |
507 | registerWithUserServer(); | 509 | registerWithUserServer(); |
508 | } | 510 | } |