merge of age verification changes from QAR-76 to release; changes were originally made on the age_verification_2007xxxx branches; final changes were QA'd on age_verification_20071112.

1 files changed, 13 insertions, 3 deletions

diff --git a/indra/newview/llweb.h b/indra/newview/llweb.h
index b339f2d8fd..318410bb3b 100644
--- a/indra/newview/llweb.h
+++ b/indra/newview/llweb.h
@@ -34,21 +34,31 @@
 #define LL_LLWEB_H
 
 #include <string>
+#include "llalertdialog.h"
 
 class LLWeb
 {
 public:
+	static void initClass();
+	
 	// Loads unescaped url in either internal web browser or external
 	// browser, depending on user settings.
-	static void loadURL(std::string url);
+	static void loadURL(const std::string& url);
 	
 	static void loadURL(const char* url) { loadURL( std::string(url) ); }
 
 	// Loads unescaped url in external browser.
-	static void loadURLExternal(std::string url);
+	static void loadURLExternal(const std::string& url);
 
 	// Returns escaped (eg, " " to "%20") url
-	static std::string escapeURL(std::string url);
+	static std::string escapeURL(const std::string& url);
+
+	class URLLoader : public LLAlertDialog::URLLoader
+	{
+		virtual void load(const std::string& url);
+	};
+
+	static URLLoader sAlertURLLoader;
 };
 
 #endif