1 files changed, 6 insertions, 13 deletions

diff --git a/linden/indra/newview/llfloaterhtmlhelp.h b/linden/indra/newview/llfloaterhtmlhelp.h
index d726b77..d52d8d3 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.h
+++ b/linden/indra/newview/llfloaterhtmlhelp.h
@@ -36,16 +36,6 @@
 #include "llfloater.h"
 #include "llwebbrowserctrl.h"
 
-class LLViewerHtmlHelp : public LLHtmlHelp
-{
-public:
-        LLViewerHtmlHelp();
-        virtual ~LLViewerHtmlHelp();
-
-        /*virtual*/ void show();
-        /*virtual*/ void show(std::string start_url);
-};
-
 class LLComboBox;
 class LLWebBrowserCtrl;
 
@@ -65,7 +55,9 @@ public:
         void buildURLHistory();
 
         static LLFloaterMediaBrowser* showInstance(const LLSD& id);
-        static void show();
+
+        static void     toggle();
+        static void     helpF1();
         static void onEnterAddress(LLUICtrl* ctrl, void* user_data);
         static void onClickRefresh(void* user_data);
         static void onClickBack(void* user_data);
@@ -76,14 +68,15 @@ public:
         static void onClickAssign(void* user_data);
         static void onClickHome(void* user_data);
         static void onClickSetHome(void* user_data);
+        static void onClickF1HelpLoadURL(S32 option, void* userdata);
 
 private:
         LLWebBrowserCtrl* mBrowser;
         LLComboBox* mAddressCombo;
         std::string mCurrentURL;
-};
 
-extern LLViewerHtmlHelp gViewerHtmlHelp;
+        static LLFloaterMediaBrowser* sInstance;
+};
 
 #endif  // LL_LLFLOATERHTMLHELP_H