livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add additional safety check

meow-7.2.2
Ansariel 2018-03-27 22:57:45 +02:00
parent cccf128895
commit 545a3cb376
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
indra/newview/fsradar.cpp
View File

@ -864,33 +864,35 @@ void FSRadar::teleportToAvatar(const LLUUID& targetAv)
}
else
{
// <FS:TS> FIRE-20862: Teleport the configured offset
// toward the center of the region from the
// <FS:TS> FIRE-20862: Teleport the configured offset toward the center of the region from the
// avatar's reported position
LLViewerRegion* avreg = world->getRegionFromPosGlobal(avpos);
LLVector3d region_center = avreg->getCenterGlobal();
LLVector3d offset = avpos - region_center;
LLVector3d destination;
F32 lateral_distance= gSavedSettings.getF32("FSTeleportToOffsetLateral");
F32 vertical_distance= gSavedSettings.getF32("FSTeleportToOffsetVertical");
if (offset.normalize() != 0.f) // there's an actual offset
{
if (lateral_distance > 0.0f)
{
offset *= lateral_distance;
destination = avpos - offset;
}
else
{
destination = avpos;
}
}
else // the target is exactly at the center, so the offset is 0
if (avreg)
{
destination = region_center + LLVector3d(0.f, lateral_distance, 0.f);
LLVector3d region_center = avreg->getCenterGlobal();
LLVector3d offset = avpos - region_center;
LLVector3d destination;
F32 lateral_distance = gSavedSettings.getF32("FSTeleportToOffsetLateral");
F32 vertical_distance = gSavedSettings.getF32("FSTeleportToOffsetVertical");
if (offset.normalize() != 0.f) // there's an actual offset
{
if (lateral_distance > 0.0f)
{
offset *= lateral_distance;
destination = avpos - offset;
}
else
{
destination = avpos;
}
}
else // the target is exactly at the center, so the offset is 0
{
destination = region_center + LLVector3d(0.f, lateral_distance, 0.f);
}
destination.mdV[VZ] = avpos.mdV[VZ] + vertical_distance;
gAgent.teleportViaLocation(destination);
}
destination.mdV[VZ] = avpos.mdV[VZ] + vertical_distance;
gAgent.teleportViaLocation(destination);
}
}
else