aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterhtml.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloaterhtml.h22
1 files changed, 18 insertions, 4 deletions
diff --git a/linden/indra/newview/llfloaterhtml.h b/linden/indra/newview/llfloaterhtml.h
index d254f68..2f6164c 100644
--- a/linden/indra/newview/llfloaterhtml.h
+++ b/linden/indra/newview/llfloaterhtml.h
@@ -13,12 +13,12 @@
13 * ("GPL"), unless you have obtained a separate licensing agreement 13 * ("GPL"), unless you have obtained a separate licensing agreement
14 * ("Other License"), formally executed by you and Linden Lab. Terms of 14 * ("Other License"), formally executed by you and Linden Lab. Terms of
15 * the GPL can be found in doc/GPL-license.txt in this distribution, or 15 * the GPL can be found in doc/GPL-license.txt in this distribution, or
16 * online at http://secondlife.com/developers/opensource/gplv2 16 * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
17 * 17 *
18 * There are special exceptions to the terms and conditions of the GPL as 18 * There are special exceptions to the terms and conditions of the GPL as
19 * it is applied to this Source Code. View the full text of the exception 19 * it is applied to this Source Code. View the full text of the exception
20 * in the file doc/FLOSS-exception.txt in this software distribution, or 20 * in the file doc/FLOSS-exception.txt in this software distribution, or
21 * online at http://secondlife.com/developers/opensource/flossexception 21 * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
22 * 22 *
23 * By copying, modifying or distributing this software, you acknowledge 23 * By copying, modifying or distributing this software, you acknowledge
24 * that you have read and understood your obligations described above, 24 * that you have read and understood your obligations described above,
@@ -34,6 +34,7 @@
34#define LL_LLFLOATERHTML_H 34#define LL_LLFLOATERHTML_H
35 35
36#include "llfloater.h" 36#include "llfloater.h"
37#include "llhtmlhelp.h"
37 38
38class LLWebBrowserCtrl; 39class LLWebBrowserCtrl;
39 40
@@ -48,10 +49,12 @@ class LLFloaterHtml :
48 virtual void onClose( bool app_quitting ); 49 virtual void onClose( bool app_quitting );
49 50
50 // Pass string like "in-world_help" or "additional help" 51 // Pass string like "in-world_help" or "additional help"
51 void show( LLString content_id ); 52 void show( LLString content_id, bool open_app_slurls );
52 53
53 // Pass raw URL and window title 54 // Pass raw URL and window title
54 void show( std::string start_url, std::string title ); 55 // Can be set to handle secondlife:///app/ URLs, but this should
56 // usually be false.
57 void show( std::string start_url, std::string title, bool open_app_slurls );
55 58
56 static void onClickClose( void* data ); 59 static void onClickClose( void* data );
57 static void onClickBack( void* data ); 60 static void onClickBack( void* data );
@@ -69,4 +72,15 @@ class LLFloaterHtml :
69 LLButton* mCloseButton; 72 LLButton* mCloseButton;
70}; 73};
71 74
75class LLViewerHtmlHelp : public LLHtmlHelp
76{
77public:
78 LLViewerHtmlHelp();
79 virtual ~LLViewerHtmlHelp();
80
81 /*virtual*/ void show(std::string start_url = "", std::string title = "");
82};
83
84extern LLViewerHtmlHelp gViewerHtmlHelp;
85
72#endif 86#endif