diff options
author | Melanie | 2012-01-24 01:17:41 +0000 |
---|---|---|
committer | Melanie | 2012-01-24 01:18:13 +0000 |
commit | c0e1784e86f3539656f4bc71aaddfc1df3d12d20 (patch) | |
tree | 64948d4bc915fd2e3e05e9d28906546fd89c5c27 | |
parent | Add a forgotten parameter (diff) | |
download | opensim-SC-c0e1784e86f3539656f4bc71aaddfc1df3d12d20.zip opensim-SC-c0e1784e86f3539656f4bc71aaddfc1df3d12d20.tar.gz opensim-SC-c0e1784e86f3539656f4bc71aaddfc1df3d12d20.tar.bz2 opensim-SC-c0e1784e86f3539656f4bc71aaddfc1df3d12d20.tar.xz |
Correct a coordinate to make the viewer like it
-rw-r--r-- | OpenSim/Framework/RegionSettings.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs index 0a59f43..399c795 100644 --- a/OpenSim/Framework/RegionSettings.cs +++ b/OpenSim/Framework/RegionSettings.cs | |||
@@ -58,7 +58,7 @@ namespace OpenSim.Framework | |||
58 | Pitch = (float)-Math.Atan2(dir.Z, Math.Sqrt(dir.X * dir.X + dir.Y * dir.Y)); | 58 | Pitch = (float)-Math.Atan2(dir.Z, Math.Sqrt(dir.X * dir.X + dir.Y * dir.Y)); |
59 | } | 59 | } |
60 | 60 | ||
61 | public Vector3 GetLocation(Vector3 pos, Quaternion rot) | 61 | public Vector3 GetLocation(Quaternion rot) |
62 | { | 62 | { |
63 | Quaternion y = Quaternion.CreateFromEulers(0, 0, Yaw); | 63 | Quaternion y = Quaternion.CreateFromEulers(0, 0, Yaw); |
64 | Quaternion p = Quaternion.CreateFromEulers(0, Pitch, 0); | 64 | Quaternion p = Quaternion.CreateFromEulers(0, Pitch, 0); |
@@ -69,7 +69,7 @@ namespace OpenSim.Framework | |||
69 | rot.W = -rot.W; | 69 | rot.W = -rot.W; |
70 | offset *= rot; | 70 | offset *= rot; |
71 | 71 | ||
72 | return pos + offset; | 72 | return offset; |
73 | } | 73 | } |
74 | } | 74 | } |
75 | 75 | ||
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 2789d5f..1855aea 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -1309,7 +1309,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
1309 | 1309 | ||
1310 | foreach (SpawnPoint sp in settings.SpawnPoints()) | 1310 | foreach (SpawnPoint sp in settings.SpawnPoints()) |
1311 | { | 1311 | { |
1312 | spawnPoints.Add(sp.GetLocation(telehub.AbsolutePosition, telehub.GroupRotation)); | 1312 | spawnPoints.Add(sp.GetLocation(telehub.GroupRotation)); |
1313 | } | 1313 | } |
1314 | 1314 | ||
1315 | client.SendTelehubInfo(settings.TelehubObject, | 1315 | client.SendTelehubInfo(settings.TelehubObject, |