diff options
Diffstat (limited to 'indra/newview/llcontrolavatar.cpp')
| -rw-r--r-- | indra/newview/llcontrolavatar.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp index d764f64c79..f63f9d7ce7 100644 --- a/indra/newview/llcontrolavatar.cpp +++ b/indra/newview/llcontrolavatar.cpp @@ -51,7 +51,7 @@ LLControlAvatar::LLControlAvatar(const LLUUID& id, const LLPCode pcode, LLViewer mScaleConstraintFixup(1.0), mRegionChanged(false) { - mIsDummy = TRUE; + mIsDummy = true; mIsControlAvatar = true; mEnableDefaultMotions = false; } @@ -294,7 +294,7 @@ void LLControlAvatar::updateVolumeGeom() return; if (mRootVolp->mDrawable->isActive()) { - mRootVolp->mDrawable->makeStatic(FALSE); + mRootVolp->mDrawable->makeStatic(false); } mRootVolp->mDrawable->makeActive(); gPipeline.markMoved(mRootVolp->mDrawable); @@ -618,9 +618,9 @@ void LLControlAvatar::updateAnimations() // virtual LLViewerObject* LLControlAvatar::lineSegmentIntersectRiggedAttachments(const LLVector4a& start, const LLVector4a& end, S32 face, - BOOL pick_transparent, - BOOL pick_rigged, - BOOL pick_unselectable, + bool pick_transparent, + bool pick_rigged, + bool pick_unselectable, S32* face_hit, LLVector4a* intersection, LLVector2* tex_coord, @@ -697,7 +697,7 @@ bool LLControlAvatar::shouldRenderRigged() const } // virtual -BOOL LLControlAvatar::isImpostor() +bool LLControlAvatar::isImpostor() { // Attached animated objects should match state of their attached av. LLVOAvatar *attached_av = getAttachedAvatar(); |