diff options
| author | Graham Linden <graham@lindenlab.com> | 2014-05-29 04:54:58 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2014-05-29 04:54:58 -0700 |
| commit | a815ad481add3dea3f67f1c1c579ddb99d9a9f48 (patch) | |
| tree | e3cf5b5b77246e8cf4917e613cbffe7e414be63c /indra/llprimitive/llmodelloader.cpp | |
| parent | b703a612d7ca96e9c79f40a33208757bba6e9d7e (diff) | |
| parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) | |
Mergeup to 3.7.9 viewer-release
Diffstat (limited to 'indra/llprimitive/llmodelloader.cpp')
| -rw-r--r-- | indra/llprimitive/llmodelloader.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llprimitive/llmodelloader.cpp b/indra/llprimitive/llmodelloader.cpp index 5138167979..cb3d482d14 100644 --- a/indra/llprimitive/llmodelloader.cpp +++ b/indra/llprimitive/llmodelloader.cpp @@ -31,6 +31,7 @@ #include "glh/glh_linear.h" #include "llmatrix4a.h" +#include <boost/bind.hpp> std::list<LLModelLoader*> LLModelLoader::sActiveLoaderList; @@ -496,7 +497,7 @@ void LLModelLoader::critiqueJointToNodeMappingFromScene( void ) } else { - llinfos<<"critiqueJointToNodeMappingFromScene is missing a: "<<name<<llendl; + LL_INFOS() <<"critiqueJointToNodeMappingFromScene is missing a: " << name << LL_ENDL; result = false; } } @@ -548,7 +549,7 @@ bool LLModelLoader::isRigLegacy( const std::vector<std::string> &jointListFromAs } if ( !result ) { - llinfos<<" Asset did not contain the joint (if you're u/l a fully rigged asset w/joint positions - it is required)." << *masterJointIt<< llendl; + LL_INFOS() <<" Asset did not contain the joint (if you're u/l a fully rigged asset w/joint positions - it is required)." << *masterJointIt<< LL_ENDL; break; } } @@ -582,7 +583,7 @@ bool LLModelLoader::isRigSuitableForJointPositionUpload( const std::vector<std:: } if ( !result ) { - llinfos<<" Asset did not contain the joint (if you're u/l a fully rigged asset w/joint positions - it is required)." << *masterJointIt<< llendl; + LL_INFOS() <<" Asset did not contain the joint (if you're u/l a fully rigged asset w/joint positions - it is required)." << *masterJointIt<< LL_ENDL; break; } } |