aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Hypergrid
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-08-23 22:24:23 +0100
committerJustin Clark-Casey (justincc)2010-08-23 22:24:23 +0100
commit74e5fe5aa94aa338c0e574553ccabd42a93b0bbd (patch)
tree1c27cc9733728cd613c7a2b84a3edd29a78823e7 /OpenSim/Services/Connectors/Hypergrid
parentCorrect a minor typo (diff)
downloadopensim-SC_OLD-74e5fe5aa94aa338c0e574553ccabd42a93b0bbd.zip
opensim-SC_OLD-74e5fe5aa94aa338c0e574553ccabd42a93b0bbd.tar.gz
opensim-SC_OLD-74e5fe5aa94aa338c0e574553ccabd42a93b0bbd.tar.bz2
opensim-SC_OLD-74e5fe5aa94aa338c0e574553ccabd42a93b0bbd.tar.xz
Remove various warnings and improve logging messages. No functional changes.
Diffstat (limited to 'OpenSim/Services/Connectors/Hypergrid')
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs4
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs7
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;
31using System.Drawing; 31using System.Drawing;
32using System.Net; 32using System.Net;
33using System.Reflection; 33using System.Reflection;
34
35using OpenSim.Framework; 34using OpenSim.Framework;
36using OpenSim.Services.Interfaces; 35using OpenSim.Services.Interfaces;
37using GridRegion = OpenSim.Services.Interfaces.GridRegion; 36using GridRegion = OpenSim.Services.Interfaces.GridRegion;
38
39using OpenMetaverse; 37using OpenMetaverse;
40using OpenMetaverse.Imaging; 38using OpenMetaverse.Imaging;
41using OpenMetaverse.StructuredData; 39using 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;
32using System.Net; 32using System.Net;
33using System.Reflection; 33using System.Reflection;
34using System.Text; 34using System.Text;
35
36using OpenSim.Framework; 35using OpenSim.Framework;
37using OpenSim.Services.Interfaces; 36using OpenSim.Services.Interfaces;
38using OpenSim.Services.Connectors.Simulation; 37using OpenSim.Services.Connectors.Simulation;
39using GridRegion = OpenSim.Services.Interfaces.GridRegion; 38using GridRegion = OpenSim.Services.Interfaces.GridRegion;
40
41using OpenMetaverse; 39using OpenMetaverse;
42using OpenMetaverse.StructuredData; 40using OpenMetaverse.StructuredData;
43using log4net; 41using 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)