diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-05-13 12:01:34 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-05-13 12:01:34 -0700 |
| commit | 9ccf7557acbc59de128ea11012b02456134e17f5 (patch) | |
| tree | 761ae21285a60f2692ac13d94ebafa27b9bd80ce /indra/newview/llfloatersearch.cpp | |
| parent | 52f1830821859379a6dad8fb6d2cb140f7fe939e (diff) | |
| parent | 039b6baf065a87d747647fb0477c799a9949ebf2 (diff) | |
Merge
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 |