From b5fcb5e872ec138ff7138906bffae193b6dae1a6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 17 Jan 2010 20:10:42 -0800
Subject: HG teleports through gatekeeper are working.

---
 OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs | 10 ----
 .../Hypergrid/GatekeeperServerConnector.cs         |  1 -
 .../Server/Handlers/Hypergrid/ObjectHandlers.cs    | 68 ----------------------
 3 files changed, 79 deletions(-)
 delete mode 100644 OpenSim/Server/Handlers/Hypergrid/ObjectHandlers.cs

(limited to 'OpenSim/Server/Handlers/Hypergrid')

diff --git a/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs
index a56363c..01e368c 100644
--- a/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs
@@ -64,16 +64,6 @@ namespace OpenSim.Server.Handlers.Hypergrid
             return m_GatekeeperService.LoginAgent(aCircuit, destination, out reason);
         }
 
-        protected override bool UpdateAgent(GridRegion destination, AgentData agent)
-        {
-            return m_GatekeeperService.UpdateAgent(destination, agent);
-        }
-
-        protected override void ReleaseAgent(UUID regionID, UUID id)
-        {
-            m_GatekeeperService.ReleaseAgent(regionID, id);
-        }
-
     }
 
 }
diff --git a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
index 27b793d..c56ea3f 100644
--- a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
@@ -65,7 +65,6 @@ namespace OpenSim.Server.Handlers.Hypergrid
             server.AddXmlRPCHandler("get_region", hghandlers.GetRegion, false);
 
             server.AddHTTPHandler("/foreignagent/", new AgentHandler(m_GatekeeperService).Handler);
-            server.AddHTTPHandler("/foreignobject/", new ObjectHandler(m_GatekeeperService).Handler);
 
         }
 
diff --git a/OpenSim/Server/Handlers/Hypergrid/ObjectHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/ObjectHandlers.cs
deleted file mode 100644
index 20eb375..0000000
--- a/OpenSim/Server/Handlers/Hypergrid/ObjectHandlers.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections;
-using System.IO;
-using System.Reflection;
-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.Servers.HttpServer;
-using OpenSim.Server.Handlers.Simulation;
-using Utils = OpenSim.Server.Handlers.Simulation.Utils;
-
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-using Nini.Config;
-using log4net;
-
-
-namespace OpenSim.Server.Handlers.Hypergrid
-{
-    public class ObjectHandler : OpenSim.Server.Handlers.Simulation.ObjectHandler
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private IGatekeeperService m_GatekeeperService;
-
-        public ObjectHandler(IGatekeeperService gatekeeper)
-        {
-            m_GatekeeperService = gatekeeper;
-        }
-
-        protected override bool CreateObject(GridRegion destination, ISceneObject sog)
-        {
-            return m_GatekeeperService.LoginAttachment(destination, sog);
-        }
-
-    }
-}
\ No newline at end of file
-- 
cgit v1.1