diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-05-06 18:21:04 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-05-06 18:21:04 -0700 |
| commit | 8dae4bc222d1b0744254442ab0b26538285341de (patch) | |
| tree | 88da67f01f0dc32457b4a5085d5e699ea55715a4 /indra/llappearance/llavatarjoint.cpp | |
| parent | f6bb6a0f935323434a3f3d0d94e94c8d8238effe (diff) | |
| parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) | |
Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile errors
Diffstat (limited to 'indra/llappearance/llavatarjoint.cpp')
| -rw-r--r-- | indra/llappearance/llavatarjoint.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llappearance/llavatarjoint.cpp b/indra/llappearance/llavatarjoint.cpp index 6ab341af64..2ee3c65a01 100644 --- a/indra/llappearance/llavatarjoint.cpp +++ b/indra/llappearance/llavatarjoint.cpp @@ -238,7 +238,7 @@ LLAvatarJointCollisionVolume::LLAvatarJointCollisionVolume() /*virtual*/ U32 LLAvatarJointCollisionVolume::render( F32 pixelArea, BOOL first_pass, BOOL is_dummy ) { - llerrs << "Cannot call render() on LLAvatarJointCollisionVolume" << llendl; + LL_ERRS() << "Cannot call render() on LLAvatarJointCollisionVolume" << LL_ENDL; return 0; } |