diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2009-12-10 22:39:07 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2009-12-10 22:39:07 +0000 |
| commit | 5ec1ecc314823f41bd2408293907b7670ff65981 (patch) | |
| tree | 35ced8b78c17495ce46cc631bcc5a544f686fa70 /indra/newview/llviewerhelp.h | |
| parent | f0146befc76f401c344ae2759c70b67b37cbf717 (diff) | |
| parent | b3f8cec38c15fecaf39b7b187aa46e8df9df8eff (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/llviewerhelp.h')
| -rw-r--r-- | indra/newview/llviewerhelp.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llviewerhelp.h b/indra/newview/llviewerhelp.h index dcb5ae32c9..07971a593e 100644 --- a/indra/newview/llviewerhelp.h +++ b/indra/newview/llviewerhelp.h @@ -51,14 +51,17 @@ class LLViewerHelp : public LLHelp, public LLSingleton<LLViewerHelp> /// display the specified help topic in the help viewer /*virtual*/ void showTopic(const std::string &topic); - /// return default (fallback) topic name suitable for showTopic() - /*virtual*/ std::string defaultTopic(); - // 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(); + // return topic to use before the user logs in - std::string preLoginTopic(); + /*virtual*/ std::string preLoginTopic(); + + // return topic to use for the top-level help, invoked by F1 + /*virtual*/ std::string f1HelpTopic(); private: static void showHelp(); // make sure help UI is visible & raised |