diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-02-01 23:24:42 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-02-01 23:33:41 +0200 |
| commit | 44b6459dfaa4f1605fdbcb7e07ac03b9d057d603 (patch) | |
| tree | c88886947e37c44b9a13db83a0c8115aea8d303f /indra/newview/llpreviewscript.cpp | |
| parent | d3169aa696f5afaff18eb4d90c8b70a4f5528eb7 (diff) | |
| parent | 21565a1f3fe1ae737e2f91c58be2c3cb0b5a2fec (diff) | |
Merge branch 'master' into DRTVWR-514-keymappings
# Conflicts:
# indra/llui/llscrolllistctrl.cpp
Diffstat (limited to 'indra/newview/llpreviewscript.cpp')
| -rw-r--r-- | indra/newview/llpreviewscript.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
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(); |