summaryrefslogtreecommitdiff
path: root/indra/newview/llwearableitemslist.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2014-01-09 12:22:24 -0800
committerRichard Linden <none@none>2014-01-09 12:22:24 -0800
commit15e6939342956f830996299352bcf7fffa7c3b85 (patch)
treedcd6443f049d35b3f3401d768b1eab735eda363b /indra/newview/llwearableitemslist.h
parentd8a81b240e828a8ab27709fb11038a4b5c4d5428 (diff)
parent1d0d485b69bbbfd63d2d56a795d818131db2667c (diff)
merge with release
Diffstat (limited to 'indra/newview/llwearableitemslist.h')
-rwxr-xr-xindra/newview/llwearableitemslist.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llwearableitemslist.h b/indra/newview/llwearableitemslist.h
index a8a5ef3117..58a00c5be0 100755
--- a/indra/newview/llwearableitemslist.h
+++ b/indra/newview/llwearableitemslist.h
@@ -258,7 +258,7 @@ public:
if (!wearable_item1 || !wearable_item2)
{
- llwarning("item1 and item2 cannot be null", 0);
+ LL_WARNS() << "item1 and item2 cannot be null" << LL_ENDL;
return true;
}