Second Life viewer sources 1.23.0-RC

1 files changed, 14 insertions, 3 deletions

diff --git a/linden/indra/newview/llurldispatcher.h b/linden/indra/newview/llurldispatcher.h
index 68bd841..a4f6866 100644
--- a/linden/indra/newview/llurldispatcher.h
+++ b/linden/indra/newview/llurldispatcher.h
@@ -17,7 +17,8 @@
  * 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://secondlifegrid.net/programs/open_source/licensing/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,
@@ -31,6 +32,9 @@
 #ifndef LLURLDISPATCHER_H
 #define LLURLDISPATCHER_H
 
+class LLWebBrowserCtrl;
+
+
 class LLURLDispatcher
 {
 public:
@@ -40,13 +44,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);