OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

iar_mods
Melanie 2012-01-23 21:25:59 +00:00
parent 48379e6442 8db64dc77f
commit c36c916342
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/CoreModules/World/Estate/TelehubManager.cs
View File

@ -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);