diff options
| author | Richard Linden <none@none> | 2011-05-13 17:02:49 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-05-13 17:02:49 -0700 |
| commit | 1e6d1879a01d57e8949add79fa4f3ef5d11c1c43 (patch) | |
| tree | 1f769d4c8375e23576ecb01457979deeeba34c24 /indra/newview/llfloatersearch.cpp | |
| parent | e8ede07451c65aea898bc3f58a980b6b0d9af302 (diff) | |
| parent | 039b6baf065a87d747647fb0477c799a9949ebf2 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
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 |