summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2010-08-18 16:58:57 -0700
committerMonroe Linden <monroe@lindenlab.com>2010-08-18 16:58:57 -0700
commit25367cb33a4ae3df474b2d77e04bf44625efde4b (patch)
treefaa2777da4c3b3e14d01d36701edffad5c654a1a /indra/newview
parentf96c1c3ac270460a19ce55e1128a58f3112a3cd1 (diff)
Add support for an "_internal" target that forces a link to open in the embedded browser, regardless of the state of the "UseExternalBrowser" pref.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llweb.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp
index b61109d490..c6219334f4 100644
--- a/indra/newview/llweb.cpp
+++ b/indra/newview/llweb.cpp
@@ -86,7 +86,12 @@ void LLWeb::initClass()
// static
void LLWeb::loadURL(const std::string& url, const std::string& target)
{
- if (gSavedSettings.getBOOL("UseExternalBrowser") || (target == "_external"))
+ if(target == "_internal")
+ {
+ // Force load in the internal browser, as if with a blank target.
+ loadURLInternal(url);
+ }
+ else if (gSavedSettings.getBOOL("UseExternalBrowser") || (target == "_external"))
{
loadURLExternal(url);
}