diff options
| author | Callum Linden <113564339+callumlinden@users.noreply.github.com> | 2023-02-14 13:53:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-14 13:53:27 -0800 |
| commit | 98f0656f5c21a9469984cc8c916a1310d2fc2849 (patch) | |
| tree | 930755196559c57b629eee54129774edc7e2bfe5 /indra/newview/llviewerhelp.h | |
| parent | a92f08b2bc0ee5a63f678c55f9a9d0ec0c4ff574 (diff) | |
| parent | 3c719cc980c942bc54c6591e33a512562aa92a8b (diff) | |
Merge pull request #82 from KittyBarnett/xcode-14.1
Xcode 14.1
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 |