diff options
| author | Richard Linden <none@none> | 2011-05-12 18:42:44 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-05-12 18:42:44 -0700 |
| commit | 166e4df2780ca004535d6f915417b36613de5b77 (patch) | |
| tree | 3212a2d6640c28bafae826fd4935ea6cc01f7b10 /indra/newview/llfloatersearch.cpp | |
| parent | 4e02747908a00a2e6103e7a923e522aed0e22ada (diff) | |
EXP-818 FIX Use different settings to control search url for beta channel viewers
Diffstat (limited to 'indra/newview/llfloatersearch.cpp')
| -rw-r--r-- | indra/newview/llfloatersearch.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp index d5806e375c..c8fe380710 100644 --- a/indra/newview/llfloatersearch.cpp +++ b/indra/newview/llfloatersearch.cpp @@ -38,6 +38,7 @@ #include "llui.h" #include "llviewercontrol.h" #include "llweb.h" +#include "llversioninfo.h" // support secondlife:///app/search/{CATEGORY}/{QUERY} SLapps class LLSearchHandler : public LLCommandHandler @@ -203,7 +204,15 @@ 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 = gSavedSettings.getString("SearchURL"); + std::string url; + if (LLVersionInfo::getChannel().find("Beta") != std::string::npos) + { + url = gSavedSettings.getString("SearchURLBeta"); + } + else + { + url = gSavedSettings.getString("SearchURL"); + } url = LLWeb::expandURLSubstitutions(url, subs); // and load the URL in the web view |