summaryrefslogtreecommitdiff
path: root/indra/newview/llweb.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2016-10-17 14:58:29 -0700
committerRider Linden <rider@lindenlab.com>2016-10-17 14:58:29 -0700
commit38d06dcce66ce3a7f5a7a1521f0305dbc0ea0bc5 (patch)
tree38745f1a60a13b496014a64690e7afda14611830 /indra/newview/llweb.cpp
parentb2eded73b9bf55e2253a9c39113ff0598c2c18cb (diff)
parent086c1342152895da28d2e0130d09432152604ca8 (diff)
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/newview/llweb.cpp')
-rw-r--r--indra/newview/llweb.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp
index b37e41fb85..8026dc3ea8 100644
--- a/indra/newview/llweb.cpp
+++ b/indra/newview/llweb.cpp
@@ -104,10 +104,10 @@ void LLWeb::loadURL(const std::string& url, const std::string& target, const std
// static
// Explicitly open a Web URL using the Web content floater
-void LLWeb::loadURLInternal(const std::string &url, const std::string& target, const std::string& uuid)
+void LLWeb::loadURLInternal(const std::string &url, const std::string& target, const std::string& uuid, bool dev_mode)
{
LLFloaterWebContent::Params p;
- p.url(url).target(target).id(uuid);
+ p.url(url).target(target).id(uuid).dev_mode(dev_mode);
LLFloaterReg::showInstance("web_content", p);
}