aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterhtmlhelp.h
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-07-14 00:02:08 -0700
committerMcCabe Maxsted2010-07-15 02:10:04 -0700
commite085b89db33622230a578c6581031697b5f91d4e (patch)
tree1eac19a2b79e3695b871f368c151e2e57f50845a /linden/indra/newview/llfloaterhtmlhelp.h
parentFixed Advanced Build Options default object size (#374). (diff)
downloadmeta-impy-e085b89db33622230a578c6581031697b5f91d4e.zip
meta-impy-e085b89db33622230a578c6581031697b5f91d4e.tar.gz
meta-impy-e085b89db33622230a578c6581031697b5f91d4e.tar.bz2
meta-impy-e085b89db33622230a578c6581031697b5f91d4e.tar.xz
Fixed #186: View > Web Browser broken
Diffstat (limited to 'linden/indra/newview/llfloaterhtmlhelp.h')
-rw-r--r--linden/indra/newview/llfloaterhtmlhelp.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/linden/indra/newview/llfloaterhtmlhelp.h b/linden/indra/newview/llfloaterhtmlhelp.h
index fa04f06..83f15cd 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.h
+++ b/linden/indra/newview/llfloaterhtmlhelp.h
@@ -50,9 +50,8 @@ public:
50class LLComboBox; 50class LLComboBox;
51class LLWebBrowserCtrl; 51class LLWebBrowserCtrl;
52 52
53class LLFloaterMediaBrowser : public LLFloater, public LLUISingleton<LLFloaterMediaBrowser, VisibilityPolicy<LLFloater> >, public LLWebBrowserCtrlObserver 53class LLFloaterMediaBrowser : public LLFloater, public LLFloaterSingleton<LLFloaterMediaBrowser>, public LLWebBrowserCtrlObserver
54{ 54{
55 friend class LLUISingleton<LLFloaterMediaBrowser, VisibilityPolicy<LLFloater> >;
56public: 55public:
57 LLFloaterMediaBrowser(const LLSD& media_data); 56 LLFloaterMediaBrowser(const LLSD& media_data);
58 57
@@ -65,9 +64,6 @@ public:
65 void openMedia(const std::string& media_url); 64 void openMedia(const std::string& media_url);
66 void buildURLHistory(); 65 void buildURLHistory();
67 66
68 static LLFloaterMediaBrowser* showInstance(const LLSD& id);
69
70 static void toggle();
71 static void helpF1(); 67 static void helpF1();
72 68
73private: 69private: