summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterhelpbrowser.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloaterhelpbrowser.h')
-rw-r--r--indra/newview/llfloaterhelpbrowser.h44
1 files changed, 22 insertions, 22 deletions
diff --git a/indra/newview/llfloaterhelpbrowser.h b/indra/newview/llfloaterhelpbrowser.h
index bf4f544a14..0dd944bf92 100644
--- a/indra/newview/llfloaterhelpbrowser.h
+++ b/indra/newview/llfloaterhelpbrowser.h
@@ -1,25 +1,25 @@
-/**
+/**
* @file llfloaterhelpbrowser.h
* @brief HTML Help floater - uses embedded web browser control
*
* $LicenseInfo:firstyear=2006&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
- *
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
- *
+ *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
+ *
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
@@ -33,32 +33,32 @@
class LLMediaCtrl;
-class LLFloaterHelpBrowser :
- public LLFloater,
- public LLViewerMediaObserver
+class LLFloaterHelpBrowser :
+ public LLFloater,
+ public LLViewerMediaObserver
{
public:
- LLFloaterHelpBrowser(const LLSD& key);
+ LLFloaterHelpBrowser(const LLSD& key);
+
+ /*virtual*/ BOOL postBuild();
+ /*virtual*/ void onClose(bool app_quitting);
+ /*virtual*/ void onOpen(const LLSD& key);
- /*virtual*/ BOOL postBuild();
- /*virtual*/ void onClose(bool app_quitting);
- /*virtual*/ void onOpen(const LLSD& key);
+ // inherited from LLViewerMediaObserver
+ /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
- // inherited from LLViewerMediaObserver
- /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
+ void openMedia(const std::string& media_url);
- void openMedia(const std::string& media_url);
-
private:
- void buildURLHistory();
- void setCurrentURL(const std::string& url);
+ void buildURLHistory();
+ void setCurrentURL(const std::string& url);
- static void onClickClose(void* user_data);
- static void onClickOpenWebBrowser(void* user_data);
+ static void onClickClose(void* user_data);
+ static void onClickOpenWebBrowser(void* user_data);
private:
- LLMediaCtrl* mBrowser;
- std::string mCurrentURL;
+ LLMediaCtrl* mBrowser;
+ std::string mCurrentURL;
};
#endif // LL_LLFLOATERHELPBROWSER_H