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

Fixed SLApp links sometimes not working

master
Hecklezz 2025-05-26 17:22:44 +10:00
parent d96c85b9af
commit 41111bc45a
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/fsslurl.cpp
View File

@ -234,17 +234,25 @@ LLSLURL::LLSLURL(const std::string& slurl)
}
else
{
LL_DEBUGS("SLURL") << "secondlife://<region>" << LL_ENDL;
// it wasn't a /secondlife/<region> or /app/<params>, so it must be secondlife://<region>
// therefore the hostname will be the region name, and it's a location type
mType = LOCATION;
if (slurl_uri.hostName() == LLSLURL::SLURL_APP_PATH)
{
LL_DEBUGS("SLURL") << "hostname is an app path" << LL_ENDL;
mType = APP;
}
else
{
LL_DEBUGS("SLURL") << "secondlife://<region>" << LL_ENDL;
// it wasn't a /secondlife/<region> or /app/<params>, so it must be secondlife://<region>
// therefore the hostname will be the region name, and it's a location type
mType = LOCATION;
//AW: use current grid for compatibility
//with viewer 1 slurls.
mGrid = LLGridManager::getInstance()->getGrid();
// AW: use current grid for compatibility
// with viewer 1 slurls.
mGrid = LLGridManager::getInstance()->getGrid();
// 'normalize' it so the region name is in fact the head of the path_array
path_array.insert(0, slurl_uri.hostNameAndPort());
// 'normalize' it so the region name is in fact the head of the path_array
path_array.insert(0, slurl_uri.hostNameAndPort());
}
}
}
else if((slurl_uri.scheme() == LLSLURL::SLURL_HTTP_SCHEME)