summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-08-16 14:45:03 -0400
committerOz Linden <oz@lindenlab.com>2011-08-16 14:45:03 -0400
commit1278223f36d1d07c32a0411fc6f8fad3b732e8ff (patch)
treebe5907cbcbedb08e075f0a510b704d34b9e83fae
parentb8320207bb911a311a498426fdd4a987dd7748ea (diff)
parent72ffcd147a85cb727d194a4c57360a1a69890cb1 (diff)
merge missing changesets for storm-1557
-rw-r--r--indra/newview/app_settings/settings.xml2
-rw-r--r--indra/newview/llfloatersearch.cpp65
-rw-r--r--indra/newview/llviewermenu.cpp2
3 files changed, 64 insertions, 5 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 01842d1037..33541b559b 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4004,7 +4004,7 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>http://search-beta.secondlife.com/viewer/[CATEGORY]/?q=[QUERY]&amp;p=[AUTH_TOKEN]&amp;r=[MATURITY]&amp;lang=[LANGUAGE]&amp;g=[GODLIKE]&amp;sid=[SESSION_ID]&amp;rid=[REGION_ID]&amp;pid=[PARCEL_ID]&amp;channel=[CHANNEL]&amp;version=[VERSION]&amp;major=[VERSION_MAJOR]&amp;minor=[VERSION_MINOR]&amp;patch=[VERSION_PATCH]&amp;build=[VERSION_BUILD]</string>
+ <string>http://search-beta.secondlife.com/viewer/[CATEGORY]/?q=[QUERY]</string>
</map>
<key>WebProfileURL</key>
<map>
diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp
index 2a946b1edf..23cc23376f 100644
--- a/indra/newview/llfloatersearch.cpp
+++ b/indra/newview/llfloatersearch.cpp
@@ -27,16 +27,26 @@
#include "llviewerprecompiledheaders.h"
+#include "llappviewer.h"
+#include "llbase64.h"
#include "llcommandhandler.h"
#include "llfloaterreg.h"
#include "llfloatersearch.h"
#include "llmediactrl.h"
#include "llnotificationsutil.h"
+#include "llparcel.h"
+#include "llplugincookiestore.h"
#include "lllogininstance.h"
#include "lluri.h"
#include "llagent.h"
+#include "llsdserialize.h"
#include "llui.h"
#include "llviewercontrol.h"
+#include "llviewerregion.h"
+#include "llversioninfo.h"
+#include "llviewermedia.h"
+#include "llviewernetwork.h"
+#include "llviewerparcelmgr.h"
#include "llweb.h"
// support secondlife:///app/search/{CATEGORY}/{QUERY} SLapps
@@ -168,12 +178,14 @@ void LLFloaterSearch::search(const SearchQuery &p)
// add the permissions token that login.cgi gave us
// We use "search_token", and fallback to "auth_token" if not present.
+ LLSD search_cookie;
+
LLSD search_token = LLLoginInstance::getInstance()->getResponse("search_token");
if (search_token.asString().empty())
{
search_token = LLLoginInstance::getInstance()->getResponse("auth_token");
}
- subs["AUTH_TOKEN"] = search_token.asString();
+ search_cookie["AUTH_TOKEN"] = search_token.asString();
// add the user's preferred maturity (can be changed via prefs)
std::string maturity;
@@ -189,10 +201,57 @@ void LLFloaterSearch::search(const SearchQuery &p)
{
maturity = "13"; // PG
}
- subs["MATURITY"] = maturity;
+ search_cookie["MATURITY"] = maturity;
// add the user's god status
- subs["GODLIKE"] = gAgent.isGodlike() ? "1" : "0";
+ search_cookie["GODLIKE"] = gAgent.isGodlike() ? "1" : "0";
+ search_cookie["VERSION"] = LLVersionInfo::getVersion();
+ search_cookie["VERSION_MAJOR"] = LLVersionInfo::getMajor();
+ search_cookie["VERSION_MINOR"] = LLVersionInfo::getMinor();
+ search_cookie["VERSION_PATCH"] = LLVersionInfo::getPatch();
+ search_cookie["VERSION_BUILD"] = LLVersionInfo::getBuild();
+ search_cookie["CHANNEL"] = LLVersionInfo::getChannel();
+ search_cookie["GRID"] = LLGridManager::getInstance()->getGridLabel();
+ search_cookie["OS"] = LLAppViewer::instance()->getOSInfo().getOSStringSimple();
+ search_cookie["SESSION_ID"] = gAgent.getSessionID();
+ search_cookie["FIRST_LOGIN"] = gAgent.isFirstLogin();
+
+ std::string lang = LLUI::getLanguage();
+ if (lang == "en-us")
+ {
+ lang = "en";
+ }
+ search_cookie["LANGUAGE"] = lang;
+
+ // find the region ID
+ LLUUID region_id;
+ LLViewerRegion *region = gAgent.getRegion();
+ if (region)
+ {
+ region_id = region->getRegionID();
+ }
+ search_cookie["REGION_ID"] = region_id;
+
+ // find the parcel local ID
+ S32 parcel_id = 0;
+ LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+ if (parcel)
+ {
+ parcel_id = parcel->getLocalID();
+ }
+ search_cookie["PARCEL_ID"] = llformat("%d", parcel_id);
+
+ std::stringstream cookie_string_stream;
+ LLSDSerialize::toXML(search_cookie, cookie_string_stream);
+ std::string cookie_string = cookie_string_stream.str();
+
+ U8* cookie_string_buffer = (U8*)cookie_string.c_str();
+ std::string cookie_value = LLBase64::encode(cookie_string_buffer, cookie_string.size());
+
+ // for staging services
+ LLViewerMedia::getCookieStore()->setCookiesFromHost(std::string("viewer_session_info=") + cookie_value, ".lindenlab.com");
+ // for live services
+ LLViewerMedia::getCookieStore()->setCookiesFromHost(std::string("viewer_session_info=") + cookie_value, ".secondlife.com");
// get the search URL and expand all of the substitutions
// (also adds things like [LANGUAGE], [VERSION], [OS], etc.)
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index ebd7c6c688..b29821479b 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -7819,7 +7819,7 @@ class LLChangeMode : public view_listener_t
{
case 0:
gSavedSettings.getControl("SessionSettingsFile")->set(new_session_settings_file);
- LLAppViewer::instance()->forceQuit();
+ LLAppViewer::instance()->requestQuit();
break;
case 1:
default: