diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2015-12-22 19:24:33 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2015-12-22 19:24:33 +0200 |
| commit | 579ed3849a5b5e2d1875c1232eab44ee2f9fe7ea (patch) | |
| tree | c6d72fe898faef4b01023ab9819299712125bd67 /indra/newview/llweb.cpp | |
| parent | 80bfd16cb0d4bbb025eda7d6b877c29c39971ea6 (diff) | |
| parent | 60dfd55edaa5df0cb864dc5086037bc5625bc0be (diff) | |
Merged lindenlab/viewer-bear 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 } |