diff options
author | Justin Clark-Casey (justincc) | 2010-08-23 22:24:23 +0100 |
---|---|---|
committer | Diva Canto | 2010-08-24 17:21:56 -0700 |
commit | 7e0a0656a44a183b1381aeb8cd876620fcfb709e (patch) | |
tree | 6e87e7f2c4b573b9ab17a0c33cad2334c2ff69cd /OpenSim/Services/Connectors/Hypergrid | |
parent | Don't allow oversized search reply packets (diff) | |
download | opensim-SC_OLD-7e0a0656a44a183b1381aeb8cd876620fcfb709e.zip opensim-SC_OLD-7e0a0656a44a183b1381aeb8cd876620fcfb709e.tar.gz opensim-SC_OLD-7e0a0656a44a183b1381aeb8cd876620fcfb709e.tar.bz2 opensim-SC_OLD-7e0a0656a44a183b1381aeb8cd876620fcfb709e.tar.xz |
Remove various warnings and improve logging messages. No functional changes.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | 4 | ||||
-rw-r--r-- | OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs index 291dd73..024b42d 100644 --- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |||
@@ -31,11 +31,9 @@ using System.Collections.Generic; | |||
31 | using System.Drawing; | 31 | using System.Drawing; |
32 | using System.Net; | 32 | using System.Net; |
33 | using System.Reflection; | 33 | using System.Reflection; |
34 | |||
35 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
36 | using OpenSim.Services.Interfaces; | 35 | using OpenSim.Services.Interfaces; |
37 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | 36 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; |
38 | |||
39 | using OpenMetaverse; | 37 | using OpenMetaverse; |
40 | using OpenMetaverse.Imaging; | 38 | using OpenMetaverse.Imaging; |
41 | using OpenMetaverse.StructuredData; | 39 | using OpenMetaverse.StructuredData; |
@@ -50,7 +48,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
50 | { | 48 | { |
51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
52 | 50 | ||
53 | private static UUID m_HGMapImage = new UUID("00000000-0000-1111-9999-000000000013"); | 51 | // private static UUID m_HGMapImage = new UUID("00000000-0000-1111-9999-000000000013"); |
54 | 52 | ||
55 | private IAssetService m_AssetService; | 53 | private IAssetService m_AssetService; |
56 | 54 | ||
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) |