From 61e27e0f6c333af6f83705492b7c0d176912f986 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 23 Oct 2020 21:13:18 +0300
Subject: SL-14050 remove references to viewer-help

---
 indra/newview/lllocationinputctrl.cpp                  | 6 ------
 indra/newview/lllocationinputctrl.h                    | 1 -
 indra/newview/llpreviewscript.cpp                      | 8 --------
 indra/newview/llpreviewscript.h                        | 1 -
 indra/newview/llviewermediafocus.cpp                   | 9 ---------
 indra/newview/skins/default/xui/en/panel_script_ed.xml | 4 ----
 6 files changed, 29 deletions(-)

diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index fd418afd2c..83195e9e3f 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -296,7 +296,6 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
 	LLButton::Params maturity_button = p.maturity_button;
 	mMaturityButton = LLUICtrlFactory::create<LLButton>(maturity_button);
 	addChild(mMaturityButton);
-	mMaturityButton->setClickedCallback(boost::bind(&LLLocationInputCtrl::onMaturityButtonClicked, this));
 
 	LLButton::Params for_sale_button = p.for_sale_button;
 	for_sale_button.tool_tip = LLTrans::getString("LocationCtrlForSaleTooltip");
@@ -663,11 +662,6 @@ void LLLocationInputCtrl::onAgentParcelChange()
 	refresh();
 }
 
-void LLLocationInputCtrl::onMaturityButtonClicked()
-{
-	LLUI::getInstance()->mHelpImpl->showTopic(mMaturityHelpTopic);
-}
-
 void LLLocationInputCtrl::onRegionBoundaryCrossed()
 {
 	createNavMeshStatusListenerForCurrentRegion();
diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h
index da71bab6c1..79dbe17982 100644
--- a/indra/newview/lllocationinputctrl.h
+++ b/indra/newview/lllocationinputctrl.h
@@ -160,7 +160,6 @@ private:
 	void					onForSaleButtonClicked();
 	void					onAddLandmarkButtonClicked();
 	void					onAgentParcelChange();
-	void					onMaturityButtonClicked();
 	void                    onRegionBoundaryCrossed();
 	void                    onNavMeshStatusChange(const LLPathfindingNavMeshStatus &pNavMeshStatus);
 	// callbacks
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 7a68d1e270..5e81fa6402 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -544,9 +544,6 @@ void LLScriptEdCore::initMenu()
 	menuItem = getChild<LLMenuItemCallGL>("Go to line...");
 	menuItem->setClickCallback(boost::bind(&LLFloaterGotoLine::show, this));
 
-	menuItem = getChild<LLMenuItemCallGL>("Help...");
-	menuItem->setClickCallback(boost::bind(&LLScriptEdCore::onBtnHelp, this));
-
 	menuItem = getChild<LLMenuItemCallGL>("Keyword Help...");
 	menuItem->setClickCallback(boost::bind(&LLScriptEdCore::onBtnDynamicHelp, this));
 
@@ -882,11 +879,6 @@ bool LLScriptEdCore::handleSaveChangesDialog(const LLSD& notification, const LLS
 	return false;
 }
 
-void LLScriptEdCore::onBtnHelp()
-{
-	LLUI::getInstance()->mHelpImpl->showTopic(HELP_LSL_PORTAL_TOPIC);
-}
-
 void LLScriptEdCore::onBtnDynamicHelp()
 {
 	LLFloater* live_help_floater = mLiveHelpHandle.get();
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h
index 74e4c00d43..3cf22a0e6e 100644
--- a/indra/newview/llpreviewscript.h
+++ b/indra/newview/llpreviewscript.h
@@ -144,7 +144,6 @@ public:
 	void 			setItemRemoved(bool script_removed){mScriptRemoved = script_removed;};
 
 private:
-	void		onBtnHelp();
 	void		onBtnDynamicHelp();
 	void		onBtnUndoChanges();
 
diff --git a/indra/newview/llviewermediafocus.cpp b/indra/newview/llviewermediafocus.cpp
index 10099eda5b..ba80eeb6b6 100644
--- a/indra/newview/llviewermediafocus.cpp
+++ b/indra/newview/llviewermediafocus.cpp
@@ -340,15 +340,6 @@ BOOL LLViewerMediaFocus::handleKey(KEY key, MASK mask, BOOL called_from_parent)
 			
 			clearFocus();
 		}
-		
-		if ( KEY_F1 == key && LLUI::getInstance()->mHelpImpl && mMediaControls.get())
-		{
-			std::string help_topic;
-			if (mMediaControls.get()->findHelpTopic(help_topic))
-			{
-				LLUI::getInstance()->mHelpImpl->showTopic(help_topic);
-			}
-		}
 	}
 	
 	return true;
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index ed37e9e2cc..545c01935b 100644
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -144,10 +144,6 @@
       mouse_opaque="false"
       name="Help"
       width="112">
-      <menu_item_call
-        label="Help..."
-        layout="topleft"
-        name="Help..." />
       <menu_item_call
         label="Keyword Help..."
         layout="topleft"
-- 
cgit v1.2.3