diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2009-11-04 09:13:49 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2009-11-04 09:13:49 +0000 |
| commit | aa59710bf7374b5107e1c8787b37b22eaf9e6d67 (patch) | |
| tree | 19f0340c685e7c7e5fd88f16267e0e96d0754ea7 /indra | |
| parent | 57703de35132216347f4b02fa8cb29a3c17efe8f (diff) | |
| parent | 068e1320399510afea2b2e2925c9755153d05423 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloatersearch.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp index bd9798c18e..97c573ddea 100644 --- a/indra/newview/llfloatersearch.cpp +++ b/indra/newview/llfloatersearch.cpp @@ -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); |