diff options
author | Callum Linden <callum@lindenlab.com> | 2022-10-24 17:48:16 -0700 |
---|---|---|
committer | Callum Linden <callum@lindenlab.com> | 2022-10-24 17:48:16 -0700 |
commit | 80585d56fd6ccb0875c6353c7620a8ada749d66d (patch) | |
tree | 139699b14e49609532ca717f9086f2039795801e /indra/newview/llnavigationbar.cpp | |
parent | b0d69a20c262441125261c4949e59a8a1b9e9628 (diff) | |
parent | e45b6159666b3aa271eaaa366fb4bcade2c2a28b (diff) |
Merge master into DRTVWR-568 (and fix conflicts)
Diffstat (limited to 'indra/newview/llnavigationbar.cpp')
-rw-r--r-- | indra/newview/llnavigationbar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index 2dd7cfab27..f5ee1171d9 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -451,9 +451,9 @@ void LLNavigationBar::onLocationSelection() if(value.has("AssetUUID")) { - gAgent.teleportViaLandmark( LLUUID(value["AssetUUID"].asString())); - mSaveToLocationHistory = true; + // user teleported by manually inputting inventory landmark's name + mSaveToLocationHistory = false; return; } else |