Mantis #1946

Thank you, HomerHorwitz, for a patch that corrects and improves TP
to landmark and home position handling.

3 files changed, 13 insertions, 1 deletions

diff --git a/OpenSim/Framework/Communications/IGridServices.cs b/OpenSim/Framework/Communications/IGridServices.cs
index 39f04c3..3ecda68 100644
--- a/OpenSim/Framework/Communications/IGridServices.cs
+++ b/OpenSim/Framework/Communications/IGridServices.cs
@@ -26,6 +26,7 @@
  */
 
 using System.Collections.Generic;
+using libsecondlife;
 
 namespace OpenSim.Framework.Communications
 {
@@ -52,6 +53,7 @@ namespace OpenSim.Framework.Communications
         List<SimpleRegionInfo> RequestNeighbours(uint x, uint y);
         
         RegionInfo RequestNeighbourInfo(ulong regionHandle);
+        RegionInfo RequestNeighbourInfo(LLUUID regionID);
         RegionInfo RequestClosestRegion(string regionName);
         Dictionary<string, string> GetGridSettings();
         List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY);
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 893a783..66ea3ea 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Framework
         IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags);
 
     public delegate void TeleportLandmarkRequest(
-        IClientAPI remoteClient, ulong regionHandle, LLVector3 position);
+        IClientAPI remoteClient, LLUUID regionID, LLVector3 position);
 
     public delegate void DisconnectUser();
 
diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs
index 17d339e..2b0e15f 100644
--- a/OpenSim/Framework/UserProfileData.cs
+++ b/OpenSim/Framework/UserProfileData.cs
@@ -149,6 +149,16 @@ namespace OpenSim.Framework
             }
         }
 
+        private LLUUID _homeRegionID;
+        /// <summary>
+        /// The regionID of the users home region. This is unique; even if the position of the region changes within the grid, this will refer to the same region.
+        /// </summary>
+        public LLUUID HomeRegionID
+        {
+            get { return _homeRegionID; }
+            set { _homeRegionID = value; }
+        }
+
         // Property wrappers
         public virtual LLUUID ID
         {