diff options
author | dolphin <dolphin@lindenlab.com> | 2014-05-07 11:14:26 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2014-05-07 11:14:26 -0700 |
commit | 48fece44737fa8b9614fd864354d9287a216ea33 (patch) | |
tree | f68426d79f4631c6b49be142a92e59086870fa38 /indra/llappearance/lldriverparam.cpp | |
parent | ae856ef31830912cec0f4de37167858a24e4ba30 (diff) | |
parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) |
Merge with 3.7.7-release
Diffstat (limited to 'indra/llappearance/lldriverparam.cpp')
-rw-r--r-- | indra/llappearance/lldriverparam.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llappearance/lldriverparam.cpp b/indra/llappearance/lldriverparam.cpp index 1f7e8b8652..c66a428374 100644 --- a/indra/llappearance/lldriverparam.cpp +++ b/indra/llappearance/lldriverparam.cpp @@ -89,7 +89,7 @@ BOOL LLDriverParamInfo::parseXml(LLXmlTreeNode* node) } else { - llerrs << "<driven> Unable to resolve driven parameter: " << driven_id << llendl; + LL_ERRS() << "<driven> Unable to resolve driven parameter: " << driven_id << LL_ENDL; return FALSE; } } @@ -139,9 +139,9 @@ void LLDriverParamInfo::toStream(std::ostream &out) } else { - llwarns << "could not get parameter " << driven.mDrivenID << " from avatar " + LL_WARNS() << "could not get parameter " << driven.mDrivenID << " from avatar " << mDriverParam->getAvatarAppearance() - << " for driver parameter " << getID() << llendl; + << " for driver parameter " << getID() << LL_ENDL; } out << std::endl; } |