diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-12 10:06:57 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-12 10:06:57 -0500 |
| commit | e2a40ec0caaf4c1f835177028e5d47dc663f9210 (patch) | |
| tree | bd6e023d2f4deb766473fb96ecdd9b11ad16f602 /indra/newview/llfloatersearch.cpp | |
| parent | 9b1680927f474992d0f2f4313c7d7b9f730862f4 (diff) | |
| parent | 95adfa4cacb68e21b7251882feffbc7cb50b4438 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloatersearch.cpp')
| -rw-r--r-- | indra/newview/llfloatersearch.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp index ca2cdffcf8..e2df2ffdf7 100644 --- a/indra/newview/llfloatersearch.cpp +++ b/indra/newview/llfloatersearch.cpp @@ -124,9 +124,19 @@ void LLFloaterSearch::search(const LLSD &key) url += "&p=" + search_token.asString(); // also append the user's preferred maturity (can be changed via prefs) - std::string maturity = "pg"; - if (gAgent.prefersMature()) maturity += ",mature"; - if (gAgent.prefersAdult()) maturity += ",adult"; + std::string maturity; + if (gAgent.prefersAdult()) + { + maturity = "42"; // PG,Mature,Adult + } + else if (gAgent.prefersMature()) + { + maturity = "21"; // PG,Mature + } + else + { + maturity = "13"; // PG + } url += "&r=" + maturity; // and load the URL in the web view |