diff options
author | Diva Canto | 2011-06-03 10:26:58 -0700 |
---|---|---|
committer | Diva Canto | 2011-06-03 10:26:58 -0700 |
commit | e33cedfd427779a3df844150869eb07b664849df (patch) | |
tree | 69a87386a2b722c7ea92074bcd5cf7a0b7fd6eaa /OpenSim/Region/Framework | |
parent | HG Landmarks being created. WARNING: new config var under [HGInventoryAccessM... (diff) | |
download | opensim-SC_OLD-e33cedfd427779a3df844150869eb07b664849df.zip opensim-SC_OLD-e33cedfd427779a3df844150869eb07b664849df.tar.gz opensim-SC_OLD-e33cedfd427779a3df844150869eb07b664849df.tar.bz2 opensim-SC_OLD-e33cedfd427779a3df844150869eb07b664849df.tar.xz |
HG Landmarks now working.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 23 |
1 files changed, 1 insertions, 22 deletions
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 | |||
2749 | public virtual void SubscribeToClientTeleportEvents(IClientAPI client) | 2749 | public virtual void SubscribeToClientTeleportEvents(IClientAPI client) |
2750 | { | 2750 | { |
2751 | client.OnTeleportLocationRequest += RequestTeleportLocation; | 2751 | client.OnTeleportLocationRequest += RequestTeleportLocation; |
2752 | client.OnTeleportLandmarkRequest += RequestTeleportLandmark; | ||
2753 | } | 2752 | } |
2754 | 2753 | ||
2755 | public virtual void SubscribeToClientScriptEvents(IClientAPI client) | 2754 | public virtual void SubscribeToClientScriptEvents(IClientAPI client) |
@@ -2875,7 +2874,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2875 | public virtual void UnSubscribeToClientTeleportEvents(IClientAPI client) | 2874 | public virtual void UnSubscribeToClientTeleportEvents(IClientAPI client) |
2876 | { | 2875 | { |
2877 | client.OnTeleportLocationRequest -= RequestTeleportLocation; | 2876 | client.OnTeleportLocationRequest -= RequestTeleportLocation; |
2878 | client.OnTeleportLandmarkRequest -= RequestTeleportLandmark; | 2877 | //client.OnTeleportLandmarkRequest -= RequestTeleportLandmark; |
2879 | //client.OnTeleportHomeRequest -= TeleportClientHome; | 2878 | //client.OnTeleportHomeRequest -= TeleportClientHome; |
2880 | } | 2879 | } |
2881 | 2880 | ||
@@ -3925,26 +3924,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
3925 | } | 3924 | } |
3926 | } | 3925 | } |
3927 | 3926 | ||
3928 | /// <summary> | ||
3929 | /// Tries to teleport agent to landmark. | ||
3930 | /// </summary> | ||
3931 | /// <param name="remoteClient"></param> | ||
3932 | /// <param name="regionHandle"></param> | ||
3933 | /// <param name="position"></param> | ||
3934 | public void RequestTeleportLandmark(IClientAPI remoteClient, UUID regionID, Vector3 position) | ||
3935 | { | ||
3936 | GridRegion info = GridService.GetRegionByUUID(UUID.Zero, regionID); | ||
3937 | |||
3938 | if (info == null) | ||
3939 | { | ||
3940 | // can't find the region: Tell viewer and abort | ||
3941 | remoteClient.SendTeleportFailed("The teleport destination could not be found."); | ||
3942 | return; | ||
3943 | } | ||
3944 | |||
3945 | RequestTeleportLocation(remoteClient, info.RegionHandle, position, Vector3.Zero, (uint)(TPFlags.SetLastToTarget | TPFlags.ViaLandmark)); | ||
3946 | } | ||
3947 | |||
3948 | public bool CrossAgentToNewRegion(ScenePresence agent, bool isFlying) | 3927 | public bool CrossAgentToNewRegion(ScenePresence agent, bool isFlying) |
3949 | { | 3928 | { |
3950 | if (m_teleportModule != null) | 3929 | if (m_teleportModule != null) |