From 522bcf17b759910040225c209f7851fbb0640c56 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Tue, 30 Nov 2010 20:52:30 -0800
Subject: SOCIAL-311 PARTIAL FIX Media browser has too many oddities to be
 useful for viewer web apps

---
 indra/newview/llweb.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

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

diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp
index 73a37a6993..91a713be56 100644
--- a/indra/newview/llweb.cpp
+++ b/indra/newview/llweb.cpp
@@ -35,6 +35,7 @@
 #include "llagent.h"
 #include "llappviewer.h"
 #include "llfloatermediabrowser.h"
+#include "llfloaterwebcontent.h"
 #include "llfloaterreg.h"
 #include "lllogininstance.h"
 #include "llparcel.h"
@@ -102,6 +103,13 @@ void LLWeb::loadURLInternal(const std::string &url, const std::string& target, c
 	LLFloaterMediaBrowser::create(url, target, uuid);
 }
 
+// static
+// Explicitly open a Web URL using the Web content floater
+void LLWeb::loadWebURLInternal(const std::string &url, const std::string& target, const std::string& uuid)
+{
+	LLFloaterWebContent::create(url, target, uuid);
+}
+
 
 // static
 void LLWeb::loadURLExternal(const std::string& url, const std::string& uuid)
-- 
cgit v1.2.3


From 84a50386be1ef34100e153666389ffacf03e8e8b Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Thu, 2 Dec 2010 18:46:26 -0800
Subject: SOCIAL-317 FIX LLWebContentFloater opens popups in the media browser

---
 indra/newview/llweb.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

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

diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp
index 91a713be56..2ecab2cbdf 100644
--- a/indra/newview/llweb.cpp
+++ b/indra/newview/llweb.cpp
@@ -96,6 +96,23 @@ void LLWeb::loadURL(const std::string& url, const std::string& target, const std
 	}
 }
 
+// static
+void LLWeb::loadWebURL(const std::string& url, const std::string& target, const std::string& uuid)
+{
+	if(target == "_internal")
+	{
+		// Force load in the internal browser, as if with a blank target.
+		loadWebURLInternal(url, "", uuid);
+	}
+	else if (gSavedSettings.getBOOL("UseExternalBrowser") || (target == "_external"))
+	{
+		loadURLExternal(url);
+	}
+	else
+	{
+		loadWebURLInternal(url, target, uuid);
+	}
+}
 
 // static
 void LLWeb::loadURLInternal(const std::string &url, const std::string& target, const std::string& uuid)
-- 
cgit v1.2.3