diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs index c1e5949..4501937 100644 --- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | |||
@@ -32,12 +32,10 @@ using System.IO; | |||
32 | using System.Net; | 32 | using System.Net; |
33 | using System.Reflection; | 33 | using System.Reflection; |
34 | using System.Text; | 34 | using System.Text; |
35 | |||
36 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
37 | using OpenSim.Services.Interfaces; | 36 | using OpenSim.Services.Interfaces; |
38 | using OpenSim.Services.Connectors.Simulation; | 37 | using OpenSim.Services.Connectors.Simulation; |
39 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | 38 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; |
40 | |||
41 | using OpenMetaverse; | 39 | using OpenMetaverse; |
42 | using OpenMetaverse.StructuredData; | 40 | using OpenMetaverse.StructuredData; |
43 | using log4net; | 41 | using log4net; |
@@ -243,7 +241,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
243 | { | 241 | { |
244 | response = request.Send(m_ServerURL, 10000); | 242 | response = request.Send(m_ServerURL, 10000); |
245 | } | 243 | } |
246 | catch (Exception e) | 244 | catch (Exception) |
247 | { | 245 | { |
248 | return null; | 246 | return null; |
249 | } | 247 | } |
@@ -308,13 +306,12 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
308 | } | 306 | } |
309 | 307 | ||
310 | } | 308 | } |
311 | catch (Exception e) | 309 | catch (Exception) |
312 | { | 310 | { |
313 | return null; | 311 | return null; |
314 | } | 312 | } |
315 | 313 | ||
316 | return null; | 314 | return null; |
317 | |||
318 | } | 315 | } |
319 | 316 | ||
320 | public bool AgentIsComingHome(UUID sessionID, string thisGridExternalName) | 317 | public bool AgentIsComingHome(UUID sessionID, string thisGridExternalName) |