diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2009-12-10 22:38:29 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2009-12-10 22:38:29 +0000 |
| commit | b3f8cec38c15fecaf39b7b187aa46e8df9df8eff (patch) | |
| tree | 27e920ddbada369711d93d681b9771fd77f17cc2 /indra/newview/llviewerhelp.h | |
| parent | d575af6a6545708d05e06a1e8614a84ca5cab458 (diff) | |
DEV-43977: Changed pre-login help browser behavior.
The special pre_login_help topic is now only displayed when the user
clicks on the "Need help logging in?" link on the login screen, or
selects the top-level Help > Second Life Help (F1) menu.
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 |