diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-18 09:48:20 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-18 09:48:20 -0400 |
| commit | 6f2e77522aded8c386edad8c4fb3a855272b3d3c (patch) | |
| tree | f0853e5bdda5dbc7bc5cfc7651fe0e477b53d081 /indra/newview/llfloatersearch.cpp | |
| parent | 7a02501aae8a21f4bf552d47e0799c4abdcd4228 (diff) | |
| parent | 4374f53e23c9d999206764b0b38473337720c1c3 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloatersearch.cpp')
| -rw-r--r-- | indra/newview/llfloatersearch.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp index c8fe380710..d5806e375c 100644 --- a/indra/newview/llfloatersearch.cpp +++ b/indra/newview/llfloatersearch.cpp @@ -38,7 +38,6 @@ #include "llui.h" #include "llviewercontrol.h" #include "llweb.h" -#include "llversioninfo.h" // support secondlife:///app/search/{CATEGORY}/{QUERY} SLapps class LLSearchHandler : public LLCommandHandler @@ -204,15 +203,7 @@ void LLFloaterSearch::search(const LLSD &key) // get the search URL and expand all of the substitutions // (also adds things like [LANGUAGE], [VERSION], [OS], etc.) - std::string url; - if (LLVersionInfo::getChannel().find("Beta") != std::string::npos) - { - url = gSavedSettings.getString("SearchURLBeta"); - } - else - { - url = gSavedSettings.getString("SearchURL"); - } + std::string url = gSavedSettings.getString("SearchURL"); url = LLWeb::expandURLSubstitutions(url, subs); // and load the URL in the web view |