Merge

--HG--
branch : product-engine

1 files changed, 17 insertions, 0 deletions

diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp
index 97c573ddea..e2df2ffdf7 100644
--- a/indra/newview/llfloatersearch.cpp
+++ b/indra/newview/llfloatersearch.cpp
@@ -36,6 +36,7 @@
 #include "llmediactrl.h"
 #include "lllogininstance.h"
 #include "lluri.h"
+#include "llagent.h"
 
 LLFloaterSearch::LLFloaterSearch(const LLSD& key) :
 	LLFloater(key),
@@ -122,6 +123,22 @@ void LLFloaterSearch::search(const LLSD &key)
 	LLSD search_token = LLLoginInstance::getInstance()->getResponse("search_token");
 	url += "&p=" + search_token.asString();
 
+	// also append the user's preferred maturity (can be changed via prefs)
+	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
 	mBrowser->navigateTo(url);
 }