diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2009-11-11 22:42:25 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2009-11-11 22:42:25 +0000 |
| commit | 6b14f9a48f18842e207013d89e4578a73ee5e7bf (patch) | |
| tree | e5461fdf76232ca000d4b5d79e59b528a123904e /indra/newview | |
| parent | d5f3e6b2a82fa166179943fab435f69059f6686b (diff) | |
DEV-41358: Changed format of preferred maturity for search.
Now preferred maturity is passed to the search web pages as an
r={13|21|42} query param.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloatersearch.cpp | 16 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_search.xml | 4 |
2 files changed, 15 insertions, 5 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 diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml index b9cf456842..d9498586af 100644 --- a/indra/newview/skins/default/xui/en/floater_search.xml +++ b/indra/newview/skins/default/xui/en/floater_search.xml @@ -25,7 +25,7 @@ Done </floater.string> <layout_stack - bottom="400" + bottom="512" follows="left|right|top|bottom" layout="topleft" left="10" @@ -54,7 +54,7 @@ layout="topleft" left_delta="0" name="status_text" - top_pad="4" + top_pad="5" width="150" /> </layout_panel> </layout_stack> |