diff options
author | Melanie | 2012-01-24 01:48:38 +0100 |
---|---|---|
committer | Melanie | 2012-01-24 01:48:38 +0100 |
commit | cc02f78d4e8f0cae4168e6d634f86d0ea9d0b537 (patch) | |
tree | b03ee9ee31441eb72a111c69d8602e39d80f4241 /OpenSim/Framework/RegionSettings.cs | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-cc02f78d4e8f0cae4168e6d634f86d0ea9d0b537.zip opensim-SC_OLD-cc02f78d4e8f0cae4168e6d634f86d0ea9d0b537.tar.gz opensim-SC_OLD-cc02f78d4e8f0cae4168e6d634f86d0ea9d0b537.tar.bz2 opensim-SC_OLD-cc02f78d4e8f0cae4168e6d634f86d0ea9d0b537.tar.xz |
Simplify and streamline telehub editing code. Verify rotations and fix
spwan point positioning on rotated telehubs.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/RegionSettings.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs index 8322cd6..786638e 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; |