From 090bf7acca33996786d4a1245c7954d7f9784105 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 24 Jan 2012 01:17:41 +0000
Subject: Correct a coordinate to make the viewer like it

---
 OpenSim/Framework/RegionSettings.cs                               | 4 ++--
 OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index 7cdfc1c..f392889 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Framework
             Pitch = (float)-Math.Atan2(dir.Z, Math.Sqrt(dir.X * dir.X + dir.Y * dir.Y));
         }
 
-        public Vector3 GetLocation(Vector3 pos, Quaternion rot)
+        public Vector3 GetLocation(Quaternion rot)
         {
             Quaternion y = Quaternion.CreateFromEulers(0, 0, Yaw);
             Quaternion p = Quaternion.CreateFromEulers(0, Pitch, 0);
@@ -69,7 +69,7 @@ namespace OpenSim.Framework
             rot.W = -rot.W;
             offset *= rot;
 
-            return pos + offset;
+            return offset;
         }
     }
 
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index ea8d396..acd22e9 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -1358,7 +1358,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
                 foreach (SpawnPoint sp in settings.SpawnPoints())
                 {
-                    spawnPoints.Add(sp.GetLocation(telehub.AbsolutePosition, telehub.GroupRotation));
+                    spawnPoints.Add(sp.GetLocation(telehub.GroupRotation));
                 }
 
                 client.SendTelehubInfo(settings.TelehubObject,
-- 
cgit v1.1