diff options
author | James Cook <james@lindenlab.com> | 2009-12-11 10:22:50 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-12-11 10:22:50 -0800 |
commit | a87b99cd950de20dc55e1ae6ce7186863a554326 (patch) | |
tree | 43d1385397cbefac07934588824a3d0716fc6365 /indra/llui/llhelp.h | |
parent | b26694f2ab4d88fb8a0e4b1f0e8733f111af4522 (diff) | |
parent | c74d5c483cbd75c5e2a0b17c8980755a9932c53a (diff) |
Merge, fixed conflict in panel_preferences_sound.xml
Diffstat (limited to 'indra/llui/llhelp.h')
-rw-r--r-- | indra/llui/llhelp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llhelp.h b/indra/llui/llhelp.h index 82c3bc385f..938419d374 100644 --- a/indra/llui/llhelp.h +++ b/indra/llui/llhelp.h @@ -42,6 +42,8 @@ class LLHelp virtual std::string defaultTopic() = 0; // return topic to use before the user logs in virtual std::string preLoginTopic() = 0; + // return topic to use for the top-level help, invoked by F1 + virtual std::string f1HelpTopic() = 0; }; #endif // headerguard |