diff options
Diffstat (limited to 'OpenSim/Region/Communications/OGS1/OGS1GridServices.cs')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 1135ddd..eada868 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -30,15 +30,17 @@ using System.Collections; | |||
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Net; | 31 | using System.Net; |
32 | using System.Net.Sockets; | 32 | using System.Net.Sockets; |
33 | using System.Reflection; | ||
33 | using System.Runtime.Remoting; | 34 | using System.Runtime.Remoting; |
34 | using System.Runtime.Remoting.Channels; | 35 | using System.Runtime.Remoting.Channels; |
35 | using System.Runtime.Remoting.Channels.Tcp; | 36 | using System.Runtime.Remoting.Channels.Tcp; |
36 | using System.Security.Authentication; | 37 | using System.Security.Authentication; |
38 | using System.Threading; | ||
37 | using libsecondlife; | 39 | using libsecondlife; |
40 | using log4net; | ||
38 | using Nwc.XmlRpc; | 41 | using Nwc.XmlRpc; |
39 | using OpenSim.Framework; | 42 | using OpenSim.Framework; |
40 | using OpenSim.Framework.Communications; | 43 | using OpenSim.Framework.Communications; |
41 | using OpenSim.Framework.Console; | ||
42 | using OpenSim.Framework.Servers; | 44 | using OpenSim.Framework.Servers; |
43 | using OpenSim.Region.Communications.Local; | 45 | using OpenSim.Region.Communications.Local; |
44 | 46 | ||
@@ -46,7 +48,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
46 | { | 48 | { |
47 | public class OGS1GridServices : IGridServices, IInterRegionCommunications | 49 | public class OGS1GridServices : IGridServices, IInterRegionCommunications |
48 | { | 50 | { |
49 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
50 | 52 | ||
51 | private LocalBackEndServices m_localBackend = new LocalBackEndServices(); | 53 | private LocalBackEndServices m_localBackend = new LocalBackEndServices(); |
52 | private Dictionary<ulong, RegionInfo> m_remoteRegionInfoCache = new Dictionary<ulong, RegionInfo>(); | 54 | private Dictionary<ulong, RegionInfo> m_remoteRegionInfoCache = new Dictionary<ulong, RegionInfo>(); |
@@ -1461,7 +1463,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1461 | Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); | 1463 | Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); |
1462 | IAsyncResult ar = socket.BeginConnect(m_EndPoint, ConnectedMethodCallback, socket); | 1464 | IAsyncResult ar = socket.BeginConnect(m_EndPoint, ConnectedMethodCallback, socket); |
1463 | ar.AsyncWaitHandle.WaitOne(timeOut*1000, false); | 1465 | ar.AsyncWaitHandle.WaitOne(timeOut*1000, false); |
1464 | System.Threading.Thread.Sleep(500); | 1466 | Thread.Sleep(500); |
1465 | } | 1467 | } |
1466 | 1468 | ||
1467 | public bool Available | 1469 | public bool Available |