From ec55f2cd10db838140b34b04717e9e50a6b736ce Mon Sep 17 00:00:00 2001 From: callum_linden Date: Fri, 13 Nov 2015 16:19:16 -0800 Subject: MAINT-5862 Fix Provide a way for new Linux users to accept ToS --- indra/newview/llweb.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llweb.cpp') 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 } -- cgit v1.2.3