1 files changed, 11 insertions, 4 deletions

diff --git a/OpenSim/Region/CoreModules/World/Estate/TelehubManager.cs b/OpenSim/Region/CoreModules/World/Estate/TelehubManager.cs
index 9b92df9..2d7d0ee 100644
--- a/OpenSim/Region/CoreModules/World/Estate/TelehubManager.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/TelehubManager.cs
@@ -109,11 +109,18 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
             try
             {
-                Vector3 thPos = m_Scene.RegionInfo.RegionSettings.TelehubPos;
-                Quaternion thRot = m_Scene.RegionInfo.RegionSettings.TelehubRot;
+                // Need to update the position in case the Telehubn has been moved
+                UUID TelehubID = m_Scene.RegionInfo.RegionSettings.TelehubObject;
+                SceneObjectPart part = m_Scene.GetSceneObjectPart(TelehubID);
 
-                float dist = (float) Util.GetDistanceTo(thPos, point);
-                Vector3 nvec = Util.GetNormalizedVector(point - thPos);
+                Vector3 TelehubPos = part.AbsolutePosition;
+                Quaternion TelehubRot = part.GetWorldRotation();
+
+                m_Scene.RegionInfo.RegionSettings.TelehubPos = TelehubPos;
+                m_Scene.RegionInfo.RegionSettings.TelehubRot = TelehubRot;
+
+                float dist = (float) Util.GetDistanceTo(TelehubPos, point);
+                Vector3 nvec = Util.GetNormalizedVector(point - TelehubPos);
                 Vector3 spoint = nvec * dist;
 
                 m_Scene.RegionInfo.RegionSettings.AddSpawnPoint(spoint);