diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-07-23 07:10:26 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-07-23 07:10:26 +0300 |
| commit | 638fe8757694b4039e8b88d83fb8b7b7cfafb1a4 (patch) | |
| tree | 2c4fb2a4d4db5022c395bafde44e01666d08a868 /indra/newview/llpanelplacestab.cpp | |
| parent | 7587f0dd88526e61a4741ad8e2d9894027de1ffb (diff) | |
| parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) | |
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/newview/llpanelpicks.cpp
# indra/newview/llpanelpicks.h
# indra/newview/llviewerfloaterreg.cpp
Diffstat (limited to 'indra/newview/llpanelplacestab.cpp')
| -rw-r--r-- | indra/newview/llpanelplacestab.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/newview/llpanelplacestab.cpp b/indra/newview/llpanelplacestab.cpp index 9644b7518e..748a917147 100644 --- a/indra/newview/llpanelplacestab.cpp +++ b/indra/newview/llpanelplacestab.cpp @@ -38,6 +38,7 @@ #include "llworldmap.h" std::string LLPanelPlacesTab::sFilterSubString = LLStringUtil::null; +LLButton* LLPanelPlacesTab::sRemoveBtn = NULL; bool LLPanelPlacesTab::isTabVisible() { @@ -47,13 +48,6 @@ bool LLPanelPlacesTab::isTabVisible() return true; } -void LLPanelPlacesTab::setPanelPlacesButtons(LLPanelPlaces* panel) -{ - mTeleportBtn = panel->getChild<LLButton>("teleport_btn"); - mShowOnMapBtn = panel->getChild<LLButton>("map_btn"); - mShowProfile = panel->getChild<LLButton>("profile_btn"); -} - void LLPanelPlacesTab::onRegionResponse(const LLVector3d& landmark_global_pos, U64 region_handle, const std::string& url, |