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

Merge pull request #115 from Hecklezz/fix/location_slurls_again 

[FIRE-35456] Fix slurl locations once again (hopefully for the last time)
meow-7.2.2
Beq Janus 2025-05-02 12:16:32 +01:00 committed by GitHub
parent ece405b0f3 4118057128
commit c513ebb777
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llurlentry.cpp
View File

@ -1249,7 +1249,7 @@ void LLUrlEntryParcel::processParcelInfo(const LLParcelData& parcel_data)
// //
LLUrlEntryPlace::LLUrlEntryPlace() LLUrlEntryPlace::LLUrlEntryPlace()
{ {
mPattern = boost::regex("((hop://[-\\w\\.\\:\\@]+/[^/]+/?)|((hop://[-\\w\\.\\:\\@]+/)|((x-grid-location-info://[-\\w\\.]+/region/)|(secondlife://)))\\S+/?(\\d+/\\d+/-?\\d+|\\d+/-?\\d+)/?)$", // <AW: hop:// protocol> mPattern = boost::regex("(((hop://[-\\w\\.\\:\\@]+/)|((x-grid-location-info://[-\\w\\.]+/region/)|(secondlife://)))\\S+/?(\\d+/\\d+/-?\\d+|\\d+/-?\\d+)/?)|(hop://[-\\w\\.\\:\\@]+/[^\\s/]+/?(?![^\\s]))", // <AW: hop:// protocol>
boost::regex::perl|boost::regex::icase); boost::regex::perl|boost::regex::icase);
mMenuName = "menu_url_slurl.xml"; mMenuName = "menu_url_slurl.xml";
mTooltip = LLTrans::getString("TooltipSLURL"); mTooltip = LLTrans::getString("TooltipSLURL");