livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0

meow-7.2.2
Lynx Linden 2009-11-04 09:13:49 +00:00
parent 57703de351 068e132039
commit aa59710bf7
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llfloatersearch.cpp
View File

@ -34,8 +34,8 @@
#include "llviewerprecompiledheaders.h"
#include "llfloatersearch.h"
#include "llmediactrl.h"
#include "llagent.h"
#include "lllogininstance.h"
#include "lluri.h"
LLFloaterSearch::LLFloaterSearch(const LLSD& key) :
LLFloater(key),
@ -116,15 +116,11 @@ void LLFloaterSearch::search(const LLSD &key)
// append the search query string
std::string search_text = key.has("id") ? key["id"].asString() : "";
url += std::string("?q=") + search_text;
url += std::string("?q=") + LLURI::escape(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;
// append the permissions token that login.cgi gave us
LLSD search_token = LLLoginInstance::getInstance()->getResponse("search_token");
url += "&p=" + search_token.asString();
// and load the URL in the web view
mBrowser->navigateTo(url);