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

Fail fixing: Only normalize trusted URLs that have been matched by LLUrlEntrySeconlifeURL

Ansariel 2015-02-25 20:24:20 +01:00
parent ee1135d056
commit 3345d5f28d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llui/llurlregistry.cpp
View File

@ -55,7 +55,11 @@ LLUrlRegistry::LLUrlRegistry()
registerUrl(new LLUrlEntrySLURL());
// decorated links for host names like: secondlife.com and lindenlab.com
registerUrl(new LLUrlEntrySeconlifeURL());
// <FS:Ansariel> Normalize only trusted URL
//registerUrl(new LLUrlEntrySeconlifeURL());
mUrlEntryTrustedUrl = new LLUrlEntrySeconlifeURL();
registerUrl(mUrlEntryTrustedUrl);
// </FS:Ansariel>
registerUrl(new LLUrlEntryHTTP());
mUrlEntryHTTPLabel = new LLUrlEntryHTTPLabel();
@ -266,7 +270,7 @@ bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LL
std::string url = text.substr(match_start, match_end - match_start + 1);
// <FS:Ansariel> Fix the "nolink>" fail; Fix from Alchemy viewer, courtesy of Drake Arconis
if (match_entry != mUrlEntryNoLink)
if (match_entry != mUrlEntryNoLink && match_entry == mUrlEntryTrustedUrl)
{
// </FS:Ansariel>
LLUriParser up(url);

2
indra/llui/llurlregistry.h
View File

@ -98,6 +98,8 @@ private:
LLUrlEntryBase* mUrlEntrySLLabel;
// <FS:Ansariel> Fix the "nolink>" fail; Fix from Alchemy viewer, courtesy of Drake Arconis
LLUrlEntryBase* mUrlEntryNoLink;
// <FS:Ansariel> Normalize only trusted URL
LLUrlEntryBase* mUrlEntryTrustedUrl;
};
#endif