aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterhtml.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:42 -0500
committerJacek Antonelli2008-08-15 23:45:42 -0500
commitce28e056c20bf2723f565bbf464b87781ec248a2 (patch)
treeef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/newview/llfloaterhtml.h
parentSecond Life viewer sources 1.19.1.4b (diff)
downloadmeta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz
Second Life viewer sources 1.20.2
Diffstat (limited to 'linden/indra/newview/llfloaterhtml.h')
-rw-r--r--linden/indra/newview/llfloaterhtml.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llfloaterhtml.h b/linden/indra/newview/llfloaterhtml.h
index ffefdf4..9826988 100644
--- a/linden/indra/newview/llfloaterhtml.h
+++ b/linden/indra/newview/llfloaterhtml.h
@@ -49,13 +49,13 @@ class LLFloaterHtml :
49 virtual void onClose( bool app_quitting ); 49 virtual void onClose( bool app_quitting );
50 50
51 // Pass string like "in-world_help" or "additional help" 51 // Pass string like "in-world_help" or "additional help"
52 void show( LLString content_id, bool open_app_slurls, bool open_link_external ); 52 void show( LLString content_id, bool open_link_external, bool open_app_slurls );
53 53
54 // Pass raw URL and window title 54 // Pass raw URL and window title
55 // Can be set to handle secondlife:///app/ URLs, but this should 55 // Can be set to handle secondlife:///app/ URLs, but this should
56 // usually be false. 56 // usually be false.
57 void show( std::string start_url, std::string title, bool open_app_slurls, bool open_link_external ); 57 void show( std::string start_url, std::string title, bool open_link_external, bool open_app_slurls );
58 58
59 static void onClickClose( void* data ); 59 static void onClickClose( void* data );
60 static void onClickBack( void* data ); 60 static void onClickBack( void* data );
61 static void onClickHome( void* data ); 61 static void onClickHome( void* data );
@@ -65,10 +65,10 @@ class LLFloaterHtml :
65 65
66 private: 66 private:
67 LLFloaterHtml(); 67 LLFloaterHtml();
68
68 LLWebBrowserCtrl* mWebBrowser; 69 LLWebBrowserCtrl* mWebBrowser;
69 static LLFloaterHtml* sInstance; 70 static LLFloaterHtml* sInstance;
70 LLButton* mCloseButton; 71 LLButton* mCloseButton;
71}; 72};
72 73
73
74#endif 74#endif