aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
diff options
context:
space:
mode:
authorMelanie2010-08-23 23:55:15 +0100
committerMelanie2010-08-23 23:55:15 +0100
commit1bfec00a88a11a13d62a32c0549bbf6e8aa1e69a (patch)
treecdb5556f5e7cbd3c846f2ed4e65479e48a5cc44f /OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parentAdd system lookup folder fix to the RemoveXInventoryServiceConnector as well ... (diff)
downloadopensim-SC-1bfec00a88a11a13d62a32c0549bbf6e8aa1e69a.zip
opensim-SC-1bfec00a88a11a13d62a32c0549bbf6e8aa1e69a.tar.gz
opensim-SC-1bfec00a88a11a13d62a32c0549bbf6e8aa1e69a.tar.bz2
opensim-SC-1bfec00a88a11a13d62a32c0549bbf6e8aa1e69a.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
index cabee4c..8d0f7be 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