diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-04-04 19:49:24 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-04-04 19:49:24 +0000 |
| commit | 98740db8fd5875033d08b6aef6d9bf5c3c49eeee (patch) | |
| tree | dd0e83734e50ffd4d9f87eb2ed4091f867f2f1fd /indra/newview/llviewermenu.cpp | |
| parent | aa96d1fddff3d5bf68a5014229a0d20584937222 (diff) | |
svn merge -r 59826:59968 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 89665171c9..114c90a4d8 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -81,6 +81,7 @@ #include "llfloatergodtools.h" #include "llfloatergroupinfo.h" #include "llfloatergroups.h" +#include "llfloaterhtml.h" #include "llfloaterhtmlhelp.h" #include "llfloaterhtmlfind.h" #include "llfloaterimport.h" @@ -6477,10 +6478,22 @@ class LLShowFloater : public view_listener_t { LLFloaterScriptDebug::show(LLUUID::null); } - else if (floater_name == "help") + else if (floater_name == "help f1") { #if LL_LIBXUL_ENABLED - LLHtmlHelp::show(NULL); + LLHtmlHelp::show(); +#endif + } + else if (floater_name == "help in-world") + { +#if LL_LIBXUL_ENABLED + LLFloaterHtml::getInstance()->show( "in-world_help" ); +#endif + } + else if (floater_name == "help additional") + { +#if LL_LIBXUL_ENABLED + LLFloaterHtml::getInstance()->show( "additional_help" ); #endif } else if (floater_name == "complaint reporter") |