diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-05-19 12:53:18 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-05-19 12:53:18 -0400 |
| commit | 1c65b8fa44cecea8f38b9944930cbed60d075528 (patch) | |
| tree | 2074515c6ed03c0d8fa2b7e5a912d3bb810bf520 /indra/newview/llfloatersearch.cpp | |
| parent | d8183a71d40da61635c05b933368f43b7d4f2a80 (diff) | |
| parent | 66554e2124dc87f61089bf96e2fe9ee5c32613d7 (diff) | |
automated merge mesh-development -> mesh-development
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 |