diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-10 19:18:44 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-10 19:18:44 -0700 |
| commit | bf7d3532c6c139f87922afbc35d8ffa579f83cca (patch) | |
| tree | 321eb01c0af0c612676846c1f3b22110ed688ee9 /indra/newview/llviewerhelp.h | |
| parent | 71879916428e9e15081d73696f46bb4a32877265 (diff) | |
| parent | ec23ec68ea8835e4155e083ec5570245b0aef1ec (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/llviewerhelp.h')
| -rw-r--r-- | indra/newview/llviewerhelp.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llviewerhelp.h b/indra/newview/llviewerhelp.h index 7612986227..a983012e2e 100644 --- a/indra/newview/llviewerhelp.h +++ b/indra/newview/llviewerhelp.h @@ -45,6 +45,8 @@ class LLViewerHelp : public LLHelp, public LLSingleton<LLViewerHelp> /// display the specified help topic in the help viewer /*virtual*/ void showTopic(const std::string &topic); + std::string getURL(const std::string& topic); + // return topic derived from viewer UI focus, else default topic std::string getTopicFromFocus(); @@ -56,10 +58,6 @@ class LLViewerHelp : public LLHelp, public LLSingleton<LLViewerHelp> // 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 - static void setRawURL(std::string url); // send URL to help UI }; #endif // header guard |