From 99aa77baae97b8de22339bded6ba890bcb86b3ee Mon Sep 17 00:00:00 2001 From: Martin Reddy Date: Mon, 2 Nov 2009 11:37:44 +0000 Subject: DEV-41358: Include the current user's maturity and teen ratings in the URL that we send to the Search web page. This can be used to determine the maturity levels to display. These bools are passed as query params in the URL (as agreed upon with the search team). --- indra/newview/llfloatersearch.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp index 4c83530f43..bd9798c18e 100644 --- a/indra/newview/llfloatersearch.cpp +++ b/indra/newview/llfloatersearch.cpp @@ -34,6 +34,7 @@ #include "llviewerprecompiledheaders.h" #include "llfloatersearch.h" #include "llmediactrl.h" +#include "llagent.h" LLFloaterSearch::LLFloaterSearch(const LLSD& key) : @@ -117,6 +118,14 @@ void LLFloaterSearch::search(const LLSD &key) std::string search_text = key.has("id") ? key["id"].asString() : ""; url += std::string("?q=") + search_text; + // append the maturity and teen capabilities for this agent + BOOL godlike = gAgent.isGodlike(); + bool mature_enabled = gAgent.canAccessMature() || godlike; + bool adult_enabled = gAgent.canAccessAdult() || godlike; + std::string mature = (mature_enabled) ? "True" : "False"; + std::string teen = (!adult_enabled) ? "True" : "False"; + url += "&t=" + teen + "&m=" + mature; + // and load the URL in the web view mBrowser->navigateTo(url); } -- cgit v1.2.3 From d8b3e7a021b97bf3cb4494c4d9228ed0a3c16738 Mon Sep 17 00:00:00 2001 From: Martin Reddy Date: Mon, 2 Nov 2009 11:50:17 +0000 Subject: Added a newline at the end of llui/lliconctrl.cpp to unbork parabuild. --- indra/llui/lliconctrl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llui/lliconctrl.cpp b/indra/llui/lliconctrl.cpp index 82ffac9580..c1bc21f2e9 100644 --- a/indra/llui/lliconctrl.cpp +++ b/indra/llui/lliconctrl.cpp @@ -123,4 +123,4 @@ void LLIconCtrl::setIconImageDrawSize() mImagep->getImage()->setKnownDrawSize(mDrawWidth, mDrawHeight) ; } } -} \ No newline at end of file +} -- cgit v1.2.3