Skip to content
Snippets Groups Projects
Commit 6c992c95 authored by Lynx Linden's avatar Lynx Linden
Browse files

EXT-3681: Send Parcel "Local ID" (S32) to web pages.

This is instead of sending the Parcel ID (LLUUID), which it turns out
the server never sends to the viewer (LLParcel::getID() always returns
NULL).
parent f7120956
No related branches found
No related tags found
No related merge requests found
...@@ -168,14 +168,14 @@ std::string LLWeb::expandURLSubstitutions(const std::string &url, ...@@ -168,14 +168,14 @@ std::string LLWeb::expandURLSubstitutions(const std::string &url,
} }
substitution["REGION_ID"] = region_id; substitution["REGION_ID"] = region_id;
// find the parcel ID // find the parcel local ID
LLUUID parcel_id; S32 parcel_id = 0;
LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel(); LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
if (parcel) if (parcel)
{ {
parcel_id = parcel->getID(); parcel_id = parcel->getLocalID();
} }
substitution["PARCEL_ID"] = parcel_id; substitution["PARCEL_ID"] = llformat("%d", parcel_id);
// expand all of the substitution strings and escape the url // expand all of the substitution strings and escape the url
std::string expanded_url = url; std::string expanded_url = url;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment