diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-09-26 21:25:11 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-09-26 21:25:11 +0100 |
| commit | 2783783575a9b712eb318b450dc5e6bb17d7f7c5 (patch) | |
| tree | fdec4e4cf274e2a916e22d73d11afbce5bb669c0 /indra/newview/llteleporthistory.cpp | |
| parent | 6d256d679e9cea63753266420ed79efa8b70dee2 (diff) | |
| parent | 58aef8beaf79dc83546a7b080014ca5030733ac8 (diff) | |
Merge to 5.2.0
Diffstat (limited to 'indra/newview/llteleporthistory.cpp')
| -rw-r--r-- | indra/newview/llteleporthistory.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llteleporthistory.cpp b/indra/newview/llteleporthistory.cpp index a20d69dd41..3c3c1c96ef 100644 --- a/indra/newview/llteleporthistory.cpp +++ b/indra/newview/llteleporthistory.cpp @@ -116,6 +116,8 @@ void LLTeleportHistory::handleLoginComplete() void LLTeleportHistory::updateCurrentLocation(const LLVector3d& new_pos) { + if (!gAgent.getRegion()) return; + if (!mTeleportHistoryStorage) { mTeleportHistoryStorage = LLTeleportHistoryStorage::getInstance(); |