summaryrefslogtreecommitdiff
path: root/indra/newview/llnavigationbar.cpp
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2021-02-25 20:25:56 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2021-02-25 20:25:56 +0200
commit806345951bcb72ae709cc19a198f78905fcbdb46 (patch)
treea1f2cca7617b76313745ae4a6bc503f28254da71 /indra/newview/llnavigationbar.cpp
parent2d4a894b706d0dcbdc753318c2c400b0d3ee92b7 (diff)
Revert "SL-14901 Add a button on the Landmarks bar to open the Places floater"
This reverts commit 2d4a894b706d0dcbdc753318c2c400b0d3ee92b7.
Diffstat (limited to 'indra/newview/llnavigationbar.cpp')
-rw-r--r--indra/newview/llnavigationbar.cpp10
1 files changed, 0 insertions, 10 deletions
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp
index 19dbbeb60e..179c64b5c5 100644
--- a/indra/newview/llnavigationbar.cpp
+++ b/indra/newview/llnavigationbar.cpp
@@ -58,7 +58,6 @@
#include "llweb.h"
#include "llhints.h"
-#include "llfloatersidepanelcontainer.h"
#include "llinventorymodel.h"
#include "lllandmarkactions.h"
@@ -291,7 +290,6 @@ BOOL LLNavigationBar::postBuild()
mBtnBack = getChild<LLPullButton>("back_btn");
mBtnForward = getChild<LLPullButton>("forward_btn");
mBtnHome = getChild<LLButton>("home_btn");
- mBtnLandmarks = getChild<LLButton>("landmarks_btn");
mCmbLocation= getChild<LLLocationInputCtrl>("location_combo");
@@ -307,8 +305,6 @@ BOOL LLNavigationBar::postBuild()
mBtnHome->setClickedCallback(boost::bind(&LLNavigationBar::onHomeButtonClicked, this));
- mBtnLandmarks->setClickedCallback(boost::bind(&LLNavigationBar::onLandmarksButtonClicked, this));
-
mCmbLocation->setCommitCallback(boost::bind(&LLNavigationBar::onLocationSelection, this));
mTeleportFinishConnection = LLViewerParcelMgr::getInstance()->
@@ -405,12 +401,6 @@ void LLNavigationBar::onHomeButtonClicked()
gAgent.teleportHome();
}
-void LLNavigationBar::onLandmarksButtonClicked()
-{
- LLFloaterReg::toggleInstanceOrBringToFront("places");
- LLFloaterSidePanelContainer::showPanel("places", LLSD().with("type", "open_landmark_tab"));
-}
-
void LLNavigationBar::onTeleportHistoryMenuItemClicked(const LLSD& userdata)
{
int idx = userdata.asInteger();