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

More banging at URI things: Want to show the full URI in the console as well...

master
Ansariel 2015-05-04 13:55:09 +02:00
parent 6e21b3e96d
commit 072e303c82
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/llui/llconsole.cpp
View File

@ -598,8 +598,18 @@ LLConsole::Paragraph::Paragraph (LLWString str, const LLColor4 &color, F32 add_t
while (LLUrlRegistry::instance().findUrl(workLine, urlMatch, boost::bind(&LLConsole::onUrlLabelCallback, console, mID, _1, _2)) && !urlMatch.getUrl().empty())
{
LLWStringUtil::replaceString(mParagraphText, utf8str_to_wstring(urlMatch.getUrl()), utf8str_to_wstring(urlMatch.getLabel()));
mUrlLabels[urlMatch.getUrl()] = urlMatch.getLabel();
// Special case for LLUrlEntryHTTP, LLUrlEntryHTTPNoProtocol and
// LLUrlEntrySecondlifeURL: getLabel() only returns host part, but
// we also want the query part
std::string label = urlMatch.getLabel();
std::string query = urlMatch.getQuery();
if (!query.empty())
{
label += query;
}
LLWStringUtil::replaceString(mParagraphText, utf8str_to_wstring(urlMatch.getUrl()), utf8str_to_wstring(label));
mUrlLabels[urlMatch.getUrl()] = label;
// Remove the URL from the work line so we don't end in a loop in case of regular URLs!
// findUrl will always return the very first URL in a string