summaryrefslogtreecommitdiff
path: root/indra/llui/llflatlistview.cpp
diff options
context:
space:
mode:
authorBaker Linden <baker@lindenlab.com>2014-05-08 14:00:55 -0700
committerBaker Linden <baker@lindenlab.com>2014-05-08 14:00:55 -0700
commit37bfd025aeef7292abb1708577eee80b6e1b91d5 (patch)
tree3dab7c728f3a4b67eae30cbbf838dec8747c5e6e /indra/llui/llflatlistview.cpp
parent1cf659d4481983684c4d5d749d95d56832dbc621 (diff)
parentd0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff)
viewer-release merge (to 3.7.8)
Diffstat (limited to 'indra/llui/llflatlistview.cpp')
-rwxr-xr-xindra/llui/llflatlistview.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp
index 97a52fada4..299f5e42d4 100755
--- a/indra/llui/llflatlistview.cpp
+++ b/indra/llui/llflatlistview.cpp
@@ -347,7 +347,7 @@ void LLFlatListView::sort()
{
if (!mItemComparator)
{
- llwarns << "No comparator specified for sorting FlatListView items." << llendl;
+ LL_WARNS() << "No comparator specified for sorting FlatListView items." << LL_ENDL;
return;
}
@@ -520,7 +520,7 @@ void LLFlatListView::onItemMouseClick(item_pair_t* item_pair, MASK mask)
if (!item_pair->first)
{
- llwarning("Attempt to selet an item pair containing null panel item", 0);
+ LL_WARNS() << "Attempt to selet an item pair containing null panel item" << LL_ENDL;
return;
}