Added the MediaEnablePopups setting as a global on/off switch for media popups.

1 files changed, 5 insertions, 2 deletions

diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index d89ee13b95..6f824b84e3 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -2835,8 +2835,11 @@ void LLViewerMediaImpl::handleMediaEvent(LLPluginClassMedia* plugin, LLPluginCla
 				// ignore this click and let media plugin handle it
 				break;
 			default:
-				// loadURL now handles distinguishing between _blank, _external, and other named targets.
-				LLWeb::loadURL(url, target);
+				if(gSavedSettings.getBOOL("MediaEnablePopups"))
+				{
+					// loadURL now handles distinguishing between _blank, _external, and other named targets.
+					LLWeb::loadURL(url, target);
+				}
 				break;
 			}
 		};