diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-11-13 16:39:51 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-11-13 16:39:51 -0800 |
| commit | 0a47b491de48b03071aad3c074ab92064b334c71 (patch) | |
| tree | 40041d049d34c1bfad98e46f0953661692b36fdf /indra/newview/llweb.cpp | |
| parent | df29aab81ba962d29b541fb84ffe0a682abcfaf5 (diff) | |
| parent | ec55f2cd10db838140b34b04717e9e50a6b736ce (diff) | |
Merged callum_linden/viewer-cef into default
Diffstat (limited to 'indra/newview/llweb.cpp')
| -rwxr-xr-x | indra/newview/llweb.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp index 0be6e49834..b37e41fb85 100755 --- a/indra/newview/llweb.cpp +++ b/indra/newview/llweb.cpp @@ -234,6 +234,9 @@ std::string LLWeb::expandURLSubstitutions(const std::string &url, //static bool LLWeb::useExternalBrowser(const std::string &url) { +#ifdef EXTERNAL_TOS + return true; +#else if (gSavedSettings.getU32("PreferredBrowserBehavior") == BROWSER_EXTERNAL_ONLY) { return true; @@ -250,4 +253,5 @@ bool LLWeb::useExternalBrowser(const std::string &url) return !(boost::regex_search(uri_string, matches, pattern)); } return false; +#endif } |