summaryrefslogtreecommitdiff
path: root/indra/newview/llnavigationbar.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-06-21 17:39:13 +0100
committerGraham Linden <graham@lindenlab.com>2018-06-21 17:39:13 +0100
commit2db71067f21f31ce19ef99a3f4b4404f24b2ad0d (patch)
tree5a6294e8beb8d9b50e973a962624bf47f234e045 /indra/newview/llnavigationbar.cpp
parent3ed3cfce56e9d5c934db350f36ab13c51e3330c1 (diff)
parentdc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff)
Merge 5.1.7
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;
}
}