diff options
author | simon <none@none> | 2014-05-07 10:56:41 -0700 |
---|---|---|
committer | simon <none@none> | 2014-05-07 10:56:41 -0700 |
commit | 250db74bf9325acdc1169f6c13d297e7fe44b753 (patch) | |
tree | c6926efeefeb10ec3a36b296aa1ac7bd8521e0e3 /indra/llui/llurlentry.cpp | |
parent | 676bad148a72c235ec79742e3f490ca66b4f40d0 (diff) | |
parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) |
Pull and merge viewer-release as version 3.7.8
Diffstat (limited to 'indra/llui/llurlentry.cpp')
-rwxr-xr-x | indra/llui/llurlentry.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index 840f67968d..6f3122e7a1 100755 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -789,7 +789,7 @@ std::string LLUrlEntryParcel::getLabel(const std::string &url, const LLUrlLabelC if (path_parts < 3) // no parcel id { - llwarns << "Failed to parse url [" << url << "]" << llendl; + LL_WARNS() << "Failed to parse url [" << url << "]" << LL_ENDL; return url; } @@ -929,7 +929,7 @@ std::string LLUrlEntryRegion::getLabel(const std::string &url, const LLUrlLabelC if (path_parts < 3) // no region name { - llwarns << "Failed to parse url [" << url << "]" << llendl; + LL_WARNS() << "Failed to parse url [" << url << "]" << LL_ENDL; return url; } |