diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-12-18 14:10:02 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-12-18 14:10:02 -0800 |
| commit | 909e4097433ab8e84a19e2119a9ecf05b3eebe64 (patch) | |
| tree | fe11439e42d20f1f2eae81e772c68b0d9fdb2692 /indra/newview/llweb.cpp | |
| parent | b98469bd7db06973e6058118551e500dc094d3c0 (diff) | |
| parent | 6dd80980cfa5be214c143d125cfabd006ea7ebff (diff) | |
Merge
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 } |