diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2016-09-01 15:22:34 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2016-09-01 15:22:34 -0400 |
commit | 7203162071163108cbbb18f90ddb7f5d6734f8bd (patch) | |
tree | 698966629d29e71f77777c75331aeac272e0371a /indra/newview/llweb.h | |
parent | 31d3d654f156351e3cf29f97fd97cbda046ae650 (diff) | |
parent | 1bbc523b048628630e0a45f67f15cdf39cb138d9 (diff) |
Automated merge with file:///Users/nat/linden/viewer-comment-lllog
Diffstat (limited to 'indra/newview/llweb.h')
-rw-r--r-- | indra/newview/llweb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llweb.h b/indra/newview/llweb.h index 7c90badbfe..7149ce9baf 100644 --- a/indra/newview/llweb.h +++ b/indra/newview/llweb.h @@ -57,7 +57,7 @@ public: static void loadURL(const std::string& url, const std::string& target = LLStringUtil::null, const std::string& uuid = LLStringUtil::null); // load content using built-in browser - static void loadURLInternal(const std::string &url, const std::string& target = LLStringUtil::null, const std::string& uuid = LLStringUtil::null); + static void loadURLInternal(const std::string &url, const std::string& target = LLStringUtil::null, const std::string& uuid = LLStringUtil::null, bool dev_mode = false); /// Returns escaped url (eg, " " to "%20") - used by all loadURL methods static std::string escapeURL(const std::string& url); |