diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-01 18:28:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-01 18:28:07 +0200 |
| commit | 43049bcff497df650c25897d640de9f038d87254 (patch) | |
| tree | c19376fa42061e5eee4e55d55cb8cb0a48e26fda /indra/newview/llviewerhelp.h | |
| parent | 9f0faf5c892bba9703c713a29202a8ac48bfdf8b (diff) | |
| parent | faf69f407fa95d9dc19f6d737f606e18ab32d052 (diff) | |
Merge pull request #916 from secondlife/marchcat/yz-merge
emoji release -> maint yz merge
Diffstat (limited to 'indra/newview/llviewerhelp.h')
| -rw-r--r-- | indra/newview/llviewerhelp.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llviewerhelp.h b/indra/newview/llviewerhelp.h index da50e07a43..bbd20bc07e 100644 --- a/indra/newview/llviewerhelp.h +++ b/indra/newview/llviewerhelp.h @@ -43,21 +43,21 @@ class LLViewerHelp : public LLHelp, public LLSingleton<LLViewerHelp> public: /// display the specified help topic in the help viewer - /*virtual*/ void showTopic(const std::string &topic); + /*virtual*/ void showTopic(const std::string &topic) override; - std::string getURL(const std::string& topic); + std::string getURL(const std::string& topic) override; // return topic derived from viewer UI focus, else default topic std::string getTopicFromFocus(); /// return default (fallback) topic name suitable for showTopic() - /*virtual*/ std::string defaultTopic(); + /*virtual*/ std::string defaultTopic() override; // return topic to use before the user logs in - /*virtual*/ std::string preLoginTopic(); + /*virtual*/ std::string preLoginTopic() override; // return topic to use for the top-level help, invoked by F1 - /*virtual*/ std::string f1HelpTopic(); + /*virtual*/ std::string f1HelpTopic() override; }; #endif // header guard |