1 files changed, 30 insertions, 21 deletions

diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs
index e80f6ab..c951653 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs
@@ -25,36 +25,45 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
+using System.Collections;
+using System.IO;
 using System.Reflection;
-using log4net;
-using OpenSim.Data;
+using System.Net;
+using System.Text;
+
+using OpenSim.Server.Base;
+using OpenSim.Server.Handlers.Base;
+using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Region.Communications.OGS1;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Server.Handlers.Simulation;
+using Utils = OpenSim.Server.Handlers.Simulation.Utils;
+
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using Nini.Config;
+using log4net;
+
 
-namespace OpenSim.Region.Communications.Hypergrid
+namespace OpenSim.Server.Handlers.Hypergrid
 {
-    public class HGCommunicationsGridMode : CommunicationsManager // CommunicationsOGS1
+    public class GatekeeperAgentHandler : OpenSim.Server.Handlers.Simulation.AgentHandler
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private IGatekeeperService m_GatekeeperService;
 
-        public HGCommunicationsGridMode(
-            NetworkServersInfo serversInfo,
-            SceneManager sman, LibraryRootFolder libraryRootFolder)
-            : base(serversInfo, libraryRootFolder)
+        public GatekeeperAgentHandler(IGatekeeperService gatekeeper)
         {
+            m_GatekeeperService = gatekeeper;
+        }
 
-            HGUserServices userServices = new HGUserServices(this);
-            // This plugin arrangement could eventually be configurable rather than hardcoded here.
-            userServices.AddPlugin(new TemporaryUserProfilePlugin());
-            userServices.AddPlugin(new HGUserDataPlugin(this, userServices));
-            
-            m_userService = userServices;
-            m_messageService = userServices;
-            m_avatarService = userServices;
+        protected override bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, out string reason)
+        {
+            return m_GatekeeperService.LoginAgent(aCircuit, destination, out reason);
         }
+
     }
+
 }