From 95af08341c5b20e7faeb58a4d39fae5d8b25fcee Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Thu, 28 Nov 2019 00:51:05 +0200
Subject: Buildfix

---
 indra/llui/llview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llui/llview.cpp')

diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 771d32d2fc..593c8b12fc 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -877,7 +877,7 @@ BOOL LLView::handleToolTip(S32 x, S32 y, MASK mask)
 		              : LLUI::getInstance()->mSettingGroups["config"]->getF32( "ToolTipDelay" );
 
 		// Even if we don't show tooltips, consume the event, nothing below should show tooltip
-		bool allow_ui_tooltips = LLUI::sSettingGroups["config"]->getBOOL( "BasicUITooltips" );
+		bool allow_ui_tooltips = LLUI::getInstance()->mSettingGroups["config"]->getBOOL("BasicUITooltips");
 		if (allow_ui_tooltips)
 		{
 			LLToolTipMgr::instance().show(LLToolTip::Params()
-- 
cgit v1.2.3


From 3f48ab1c0560d9a0c9401990aa4c9ddfca826d0b Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Thu, 23 Jul 2020 00:46:20 +0300
Subject: SL-13642 Get rid of that ugly ignore -Wdelete-incomplete

Get rid of that ugly '#pragma clang diagnostic ignored "-Wdelete-incomplete"' by making sure the delete always happens inside llview.cpp, where the type of LLView is known.
---
 indra/llui/llview.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/llui/llview.cpp')

diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 593c8b12fc..bd213d594a 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -86,6 +86,11 @@ template class LLView* LLView::getChild<class LLView>(
 
 static LLDefaultChildRegistry::Register<LLView> r("view");
 
+void deleteView(LLView *aView)
+{
+	delete aView;
+}
+
 namespace LLInitParam
 {
 	void TypeValues<LLView::EOrientation>::declareValues()
-- 
cgit v1.2.3