diff options
| author | callum_linden <none@none> | 2015-11-13 16:19:16 -0800 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-11-13 16:19:16 -0800 |
| commit | ec55f2cd10db838140b34b04717e9e50a6b736ce (patch) | |
| tree | a388597838c75bc37430ca9d848902ac7a55e78e /indra/newview/llweb.cpp | |
| parent | 2091813119fbe915ad1427ad51202e67ff086180 (diff) | |
MAINT-5862 Fix Provide a way for new Linux users to accept ToS
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 } |