From 51efcfea259ef425c42895e0b6b5d77c2371fdf3 Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Thu, 4 Aug 2022 01:51:07 +0300
Subject: [PATCH] DRTVWR-544 Post-merge build fix
---
indra/newview/llpanelface.cpp | 26 +++++---------------------
indra/newview/llpanelface.h | 2 --
2 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index de1a84e0f1f..178aba11a33 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -334,17 +334,20 @@ LLPanelFace::LLPanelFace()
mEnableCallbackRegistrar.add("PanelFace.menuEnable", boost::bind(&LLPanelFace::menuEnableItem, this, _2));
}
-
LLPanelFace::~LLPanelFace()
{
unloadMedia();
}
-
void LLPanelFace::draw()
{
updateCopyTexButton();
+ // grab media name/title and update the UI widget
+ // Todo: move it, it's preferable not to update
+ // labels inside draw
+ updateMediaTitle();
+
LLPanel::draw();
}
@@ -1795,17 +1798,6 @@ void LLPanelFace::unloadMedia()
mTitleMedia->unloadMediaSource();
}
-void LLPanelFace::draw()
-{
- // grab media name/title and update the UI widget
- // Todo: move it, it's preferable not to update
- // labels inside draw
- updateMediaTitle();
-
- // mCheckSelectIndividual->set(gSavedSettings.getBOOL("EditLinkedParts"));
- LLPanel::draw();
-}
-
//////////////////////////////////////////////////////////////////////////////
//
void LLPanelFace::navigateToTitleMedia( const std::string url )
@@ -4211,14 +4203,6 @@ bool LLPanelFace::menuEnableItem(const LLSD& userdata)
}
-// TODO: I don't know who put these in or what these are for???
-void LLPanelFace::setMediaURL(const std::string& url)
-{
-}
-void LLPanelFace::setMediaType(const std::string& mime_type)
-{
-}
-
// static
void LLPanelFace::onCommitPlanarAlign(LLUICtrl* ctrl, void* userdata)
{
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h
index 688bdc7278f..44bc442bbb8 100644
--- a/indra/newview/llpanelface.h
+++ b/indra/newview/llpanelface.h
@@ -98,8 +98,6 @@ class LLPanelFace : public LLPanel
LLPanelFace();
virtual ~LLPanelFace();
- void draw();
-
void refresh();
void refreshMedia();
void unloadMedia();
--
GitLab