livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

meow-7.2.2
Monroe Linden 2010-08-26 12:26:31 -07:00
parent 6cd9103dcf
commit 74d4bbfa0a
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -5164,6 +5164,17 @@
<key>Value</key>
<real>3.0</real>
</map>
<key>MediaEnablePopups</key>
<map>
<key>Comment</key>
<string>If true, enable targeted links and javascript in media to open new media browser windows.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>MediaOnAPrimUI</key>
<map>
<key>Comment</key>

7
indra/newview/llviewermedia.cpp
View File

@ -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;
}
};