svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge

Resolving QAR-1051 Merge featurettes batch #4

1 files changed, 12 insertions, 2 deletions

diff --git a/indra/newview/llurldispatcher.h b/indra/newview/llurldispatcher.h
index a8629626b1..6640ca11b3 100644
--- a/indra/newview/llurldispatcher.h
+++ b/indra/newview/llurldispatcher.h
@@ -31,6 +31,9 @@
 #ifndef LLURLDISPATCHER_H
 #define LLURLDISPATCHER_H
 
+class LLWebBrowserCtrl;
+
+
 class LLURLDispatcher
 {
 public:
@@ -40,13 +43,20 @@ public:
 	static bool isSLURLCommand(const std::string& url);
 		// Is this a special secondlife://app/ URL?
 
-	static bool dispatch(const std::string& url, bool from_external_browser);
+	static bool dispatch(const std::string& url,
+						 LLWebBrowserCtrl* web,
+						 bool trusted_browser);
 		// At startup time and on clicks in internal web browsers,
 		// teleport, open map, or run requested command.
-		// Handles:
+		// @param url
 		//   secondlife://RegionName/123/45/67/
 		//   secondlife:///app/agent/3d6181b0-6a4b-97ef-18d8-722652995cf1/show
 		//   sl://app/foo/bar
+		// @param web
+		//	 Pointer to LLWebBrowserCtrl sending URL, can be NULL
+		// @param trusted_browser
+		//   True if coming inside the app AND from a brower instance
+		//   that navigates to trusted (Linden Lab) pages.
 		// Returns true if someone handled the URL.
 
 	static bool dispatchRightClick(const std::string& url);