diff options
author | Rider Linden <rider@lindenlab.com> | 2018-09-26 13:46:45 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2018-09-26 13:46:45 -0700 |
commit | 78866b33a9f3a44db11a18245e8a37c834297a46 (patch) | |
tree | fd5c39a17334de8602ee2f20df020eaaa6e01e55 /indra/newview/llteleporthistory.cpp | |
parent | 2d5fa7a732661f97b028ddcbabdd4fb3ba825a52 (diff) | |
parent | 58aef8beaf79dc83546a7b080014ca5030733ac8 (diff) |
Merge
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(); |