summaryrefslogtreecommitdiff
path: root/indra/newview/llnavigationbar.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2018-06-21 15:31:21 -0400
committerOz Linden <oz@lindenlab.com>2018-06-21 15:31:21 -0400
commit3cdce9bf24ebac1c48b30955910a8f6b36797cb5 (patch)
tree5f731c4237dfe544e475c7d5f119aa2c6e8edcb8 /indra/newview/llnavigationbar.cpp
parentc0e00cc61750d2b1bba3ada6622023df4725b1a4 (diff)
parentdc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff)
merge changes for 5.1.6-release
Diffstat (limited to 'indra/newview/llnavigationbar.cpp')
-rw-r--r--indra/newview/llnavigationbar.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp
index 84a2cd8be1..cfe2e6bf6a 100644
--- a/indra/newview/llnavigationbar.cpp
+++ b/indra/newview/llnavigationbar.cpp
@@ -443,6 +443,7 @@ void LLNavigationBar::onLocationSelection()
{
gAgent.teleportViaLandmark( LLUUID(value["AssetUUID"].asString()));
+ mSaveToLocationHistory = true;
return;
}
else
@@ -453,6 +454,7 @@ void LLNavigationBar::onLocationSelection()
if (!landmark_items.empty())
{
gAgent.teleportViaLandmark( landmark_items[0]->getAssetUUID());
+ mSaveToLocationHistory = true;
return;
}
}