From e1d8dac25a93db837c780428a23f81cbf9109270 Mon Sep 17 00:00:00 2001
From: Melinda Green <melinda@lindenlab.com>
Date: Mon, 15 Dec 2008 21:21:19 +0000
Subject: svn merge -r105329:105903
 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge
 Resolving QAR-1051 Merge featurettes batch #4

---
 indra/newview/llviewerwindow.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llviewerwindow.cpp')

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 38e376b511..edb339eab4 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1342,8 +1342,9 @@ void LLViewerWindow::handleDataCopy(LLWindow *window, S32 data_type, void *data)
 	case SLURL_MESSAGE_TYPE:
 		// received URL
 		std::string url = (const char*)data;
-		const bool from_external_browser = true;
-		if (LLURLDispatcher::dispatch(url, from_external_browser))
+		LLWebBrowserCtrl* web = NULL;
+		const bool trusted_browser = false;
+		if (LLURLDispatcher::dispatch(url, web, trusted_browser))
 		{
 			// bring window to foreground, as it has just been "launched" from a URL
 			mWindow->bringToFront();
-- 
cgit v1.2.3