diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2015-12-22 17:59:01 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2015-12-22 17:59:01 +0200 |
| commit | b095e2c985680660d61a99e8dbac78d9113b9870 (patch) | |
| tree | 171d31162fcb58f05c440de7ae383c7a88819a43 /indra/newview/llweb.cpp | |
| parent | 49fa9b5515e708083c85aaa2b1b522bc266944c4 (diff) | |
| parent | 60dfd55edaa5df0cb864dc5086037bc5625bc0be (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 } |