From e33cedfd427779a3df844150869eb07b664849df Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 3 Jun 2011 10:26:58 -0700
Subject: HG Landmarks now working.
---
OpenSim/Region/Framework/Scenes/Scene.cs | 23 +----------------------
1 file changed, 1 insertion(+), 22 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index b179683..77301d8 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2749,7 +2749,6 @@ namespace OpenSim.Region.Framework.Scenes
public virtual void SubscribeToClientTeleportEvents(IClientAPI client)
{
client.OnTeleportLocationRequest += RequestTeleportLocation;
- client.OnTeleportLandmarkRequest += RequestTeleportLandmark;
}
public virtual void SubscribeToClientScriptEvents(IClientAPI client)
@@ -2875,7 +2874,7 @@ namespace OpenSim.Region.Framework.Scenes
public virtual void UnSubscribeToClientTeleportEvents(IClientAPI client)
{
client.OnTeleportLocationRequest -= RequestTeleportLocation;
- client.OnTeleportLandmarkRequest -= RequestTeleportLandmark;
+ //client.OnTeleportLandmarkRequest -= RequestTeleportLandmark;
//client.OnTeleportHomeRequest -= TeleportClientHome;
}
@@ -3925,26 +3924,6 @@ namespace OpenSim.Region.Framework.Scenes
}
}
- ///
- /// Tries to teleport agent to landmark.
- ///
- ///
- ///
- ///
- public void RequestTeleportLandmark(IClientAPI remoteClient, UUID regionID, Vector3 position)
- {
- GridRegion info = GridService.GetRegionByUUID(UUID.Zero, regionID);
-
- if (info == null)
- {
- // can't find the region: Tell viewer and abort
- remoteClient.SendTeleportFailed("The teleport destination could not be found.");
- return;
- }
-
- RequestTeleportLocation(remoteClient, info.RegionHandle, position, Vector3.Zero, (uint)(TPFlags.SetLastToTarget | TPFlags.ViaLandmark));
- }
-
public bool CrossAgentToNewRegion(ScenePresence agent, bool isFlying)
{
if (m_teleportModule != null)
--
cgit v1.1