Fixed normal bug EXT-3139 (Invalid Region/Parcel name is shown for

intra-region teleports in the back/fwd history).

--HG--
branch : product-engine
meow-7.2.2
Andrew Dyukov 2009-12-09 16:47:26 +02:00
parent d5f7f1b723
commit a2e06d2c96
1 changed files with 3 additions and 2 deletions

View File

@ -2525,7 +2525,8 @@ boost::signals2::connection LLViewerParcelMgr::setTeleportFailedCallback(parcel_
*/
void LLViewerParcelMgr::onTeleportFinished(bool local, const LLVector3d& new_pos)
{
if (local)
// Treat only teleports within the same parcel as local (EXT-3139).
if (local && LLViewerParcelMgr::getInstance()->inAgentParcel(new_pos))
{
// Local teleport. We already have the agent parcel data.
// Emit the signal immediately.
@ -2533,7 +2534,7 @@ void LLViewerParcelMgr::onTeleportFinished(bool local, const LLVector3d& new_pos
}
else
{
// Non-local teleport.
// Non-local teleport (inter-region or between different parcels of the same region).
// The agent parcel data has not been updated yet.
// Let's wait for the update and then emit the signal.
mTeleportInProgress = TRUE;