diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2009-12-09 16:47:26 +0200 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2009-12-09 16:47:26 +0200 |
| commit | a2e06d2c960944b90fe26ba266d8d58f2530e3de (patch) | |
| tree | 82edb38e3094f92e4a516c6cc992610bef62fe95 /indra/newview/llviewerparcelmgr.cpp | |
| parent | d5f7f1b723a14b15862c38469424133087353bf3 (diff) | |
Fixed normal bug EXT-3139 (Invalid Region/Parcel name is shown for
intra-region teleports in the back/fwd history).
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index 2fae78cdfb..7a1abfd4e8 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -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; |