From b286a9091b66c816f12e9a98e5ae092549261904 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Fri, 25 Mar 2011 13:56:14 -0700
Subject: SOCIAL-688 FIX Multiple SLurls error given in minimal skin when
 clicking links in web profile Also fixes SOCIAL-521 and SOCIAL-428

---
 indra/newview/llurldispatcher.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/llurldispatcher.h')

diff --git a/indra/newview/llurldispatcher.h b/indra/newview/llurldispatcher.h
index b07db4da3f..6309a97af5 100644
--- a/indra/newview/llurldispatcher.h
+++ b/indra/newview/llurldispatcher.h
@@ -33,6 +33,7 @@ class LLURLDispatcher
 public:
 	
 	static bool dispatch(const std::string& slurl,
+						 const std::string& nav_type,
 						 LLMediaCtrl* web,
 						 bool trusted_browser);	
 		// At startup time and on clicks in internal web browsers,
@@ -41,6 +42,8 @@ public:
 		//   secondlife://RegionName/123/45/67/
 		//   secondlife:///app/agent/3d6181b0-6a4b-97ef-18d8-722652995cf1/show
 		//   sl://app/foo/bar
+		// @param nav_type
+		//   type of navigation type (see LLQtWebKit::LLWebPage::acceptNavigationRequest)
 		// @param web
 		//	 Pointer to LLMediaCtrl sending URL, can be NULL
 		// @param trusted_browser
-- 
cgit v1.2.3