diff options
author | Richard Linden <none@none> | 2013-11-12 11:42:06 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2013-11-12 11:42:06 -0800 |
commit | 6ddfc8031c73f342cf8459445a20cd50ceb3efba (patch) | |
tree | 4a209fa66ac39930c089a1477a1f4eb2542ad5bb /indra/newview/llvoavatar.cpp | |
parent | b6688529877e9f3a46d251c64c002fbe8fd8cbb6 (diff) |
BUILDFIX - miscellaneous stuff missed in the merge
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rwxr-xr-x | indra/newview/llvoavatar.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index bccb0d46cf..3652e422c5 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -5517,10 +5517,10 @@ void LLVOAvatar::addChild(LLViewerObject *childp) { if (!attachObject(childp)) { - llwarns << "addChild() failed for " + LL_WARNS() << "addChild() failed for " << childp->getID() << " item " << childp->getAttachmentItemID() - << llendl; + << LL_ENDL; // MAINT-3312 backout // mPendingAttachment.push_back(childp); } @@ -5652,10 +5652,10 @@ void LLVOAvatar::lazyAttach() { if (!attachObject(cur_attachment)) { // Drop it - llwarns << "attachObject() failed for " + LL_WARNS() << "attachObject() failed for " << cur_attachment->getID() << " item " << cur_attachment->getAttachmentItemID() - << llendl; + << LL_ENDL; // MAINT-3312 backout //still_pending.push_back(cur_attachment); } |