diff options
author | Baker Linden <baker@lindenlab.com> | 2014-05-08 14:00:55 -0700 |
---|---|---|
committer | Baker Linden <baker@lindenlab.com> | 2014-05-08 14:00:55 -0700 |
commit | 37bfd025aeef7292abb1708577eee80b6e1b91d5 (patch) | |
tree | 3dab7c728f3a4b67eae30cbbf838dec8747c5e6e /indra/llui/llurlentry.cpp | |
parent | 1cf659d4481983684c4d5d749d95d56832dbc621 (diff) | |
parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) |
viewer-release merge (to 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; } |