diff options
| author | skolb <none@none> | 2009-12-11 08:49:37 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2009-12-11 08:49:37 -0800 |
| commit | 6542ffe2f05c47d74dfbe659041d956d609f91f3 (patch) | |
| tree | 7794c0737c5a78b0339c2c34b47c9d32c44de749 /indra/newview/llviewerhelp.h | |
| parent | 431bfca2ade364dc1165e402537e5e2d3616ebfd (diff) | |
| parent | eda8634b17133df5f3104d96ad56d3626a90aad8 (diff) | |
Merge viewer 2-0 into media
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 |