diff options
author | simon <none@none> | 2014-05-07 13:19:05 -0700 |
---|---|---|
committer | simon <none@none> | 2014-05-07 13:19:05 -0700 |
commit | dc4c184696b308b8f60fa1dd751b35e22bd47d62 (patch) | |
tree | 1606d992f1cce6fe19572042c456725eb95d7066 /indra/newview/llplacesfolderview.cpp | |
parent | 883467a3cc421fca68a25589114e0e3f0538ff0e (diff) | |
parent | 250db74bf9325acdc1169f6c13d297e7fe44b753 (diff) |
Merge downstream version 3.7.8 code
Diffstat (limited to 'indra/newview/llplacesfolderview.cpp')
-rwxr-xr-x | indra/newview/llplacesfolderview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llplacesfolderview.cpp b/indra/newview/llplacesfolderview.cpp index 1cb013adc6..fe89c1e314 100755 --- a/indra/newview/llplacesfolderview.cpp +++ b/indra/newview/llplacesfolderview.cpp @@ -60,7 +60,7 @@ BOOL LLPlacesFolderView::handleRightMouseDown(S32 x, S32 y, MASK mask) } else { - llwarns << "Requested menu handle for non-setup inventory type: " << inventory_type << llendl; + LL_WARNS() << "Requested menu handle for non-setup inventory type: " << inventory_type << LL_ENDL; } } |