aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionSettings.cs
diff options
context:
space:
mode:
authorMelanie2012-01-24 01:48:38 +0100
committerMelanie2012-01-24 02:36:35 +0000
commita4977bbe190fb6c1eb5c45247b9222c719118fd4 (patch)
treec6e028bc3b06c607ff5372a1808b5922a74801b0 /OpenSim/Framework/RegionSettings.cs
parentReverse the spawn point distance vector (diff)
downloadopensim-SC-a4977bbe190fb6c1eb5c45247b9222c719118fd4.zip
opensim-SC-a4977bbe190fb6c1eb5c45247b9222c719118fd4.tar.gz
opensim-SC-a4977bbe190fb6c1eb5c45247b9222c719118fd4.tar.bz2
opensim-SC-a4977bbe190fb6c1eb5c45247b9222c719118fd4.tar.xz
Simplify and streamline telehub editing code. Verify rotations and fix
spwan point positioning on rotated telehubs.
Diffstat (limited to 'OpenSim/Framework/RegionSettings.cs')
-rw-r--r--OpenSim/Framework/RegionSettings.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index 9ffde03..e115432 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -47,6 +47,7 @@ namespace OpenSim.Framework
47 47
48 // Next we need to rotate this vector into the spawn point's 48 // Next we need to rotate this vector into the spawn point's
49 // coordinate system 49 // coordinate system
50 rot.W = -rot.W;
50 offset = offset * rot; 51 offset = offset * rot;
51 52
52 Vector3 dir = Vector3.Normalize(offset); 53 Vector3 dir = Vector3.Normalize(offset);
@@ -66,7 +67,6 @@ namespace OpenSim.Framework
66 Vector3 dir = new Vector3(1, 0, 0) * p * y; 67 Vector3 dir = new Vector3(1, 0, 0) * p * y;
67 Vector3 offset = dir * (float)Distance; 68 Vector3 offset = dir * (float)Distance;
68 69
69 rot.W = -rot.W;
70 offset *= rot; 70 offset *= rot;
71 71
72 return pos + offset; 72 return pos + offset;