Second Life viewer sources 1.19.0.0

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 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -34,6 +34,7 @@
 #define LL_LLFLOATERHTML_H
 
 #include "llfloater.h"
+#include "llhtmlhelp.h"
 
 class LLWebBrowserCtrl;
 
@@ -48,10 +49,12 @@ class LLFloaterHtml :
                 virtual void onClose( bool app_quitting );
                 
                 // Pass string like "in-world_help" or "additional help"
-                void show( LLString content_id );
+                void show( LLString content_id, bool open_app_slurls );
 
                 // Pass raw URL and window title
-                void show( std::string start_url, std::string title );
+                // Can be set to handle secondlife:///app/ URLs, but this should
+                // usually be false.
+                void show( std::string start_url, std::string title, bool open_app_slurls );
 
                 static void onClickClose( void* data );
                 static void onClickBack( void* data );
@@ -69,4 +72,15 @@ class LLFloaterHtml :
                 LLButton* mCloseButton;
 };
 
+class LLViewerHtmlHelp : public LLHtmlHelp
+{
+public:
+        LLViewerHtmlHelp();
+        virtual ~LLViewerHtmlHelp();
+
+        /*virtual*/ void show(std::string start_url = "", std::string title = "");
+};
+
+extern LLViewerHtmlHelp gViewerHtmlHelp;
+
 #endif