diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-22 09:30:04 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-22 09:30:04 -0400 |
| commit | eb81d5f23fc725f53857d7a62923e273a057c455 (patch) | |
| tree | 5c1ba76e722d9630fa597023a1e6c196a04f758c /indra/newview/llface.h | |
| parent | f8ccb39b8d944f9d2bf4308f909273cd5a35cbe7 (diff) | |
| parent | 47985e5822ce9fdebb7443e13b3c1a781a842ecd (diff) | |
Merge remote-tracking branch 'DRTVWR-600-maint-A' into nat/kwds
Diffstat (limited to 'indra/newview/llface.h')
| -rw-r--r-- | indra/newview/llface.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llface.h b/indra/newview/llface.h index d8476d39c5..b5018abc64 100644 --- a/indra/newview/llface.h +++ b/indra/newview/llface.h @@ -117,14 +117,14 @@ public: U32 getState() const { return mState; } void setState(U32 state) { mState |= state; } void clearState(U32 state) { mState &= ~state; } - bool isState(U32 state) const { return ((mState & state) != 0) ? true : false; } + bool isState(U32 state) const { return (mState & state) != 0; } void setVirtualSize(F32 size) { mVSize = size; } void setPixelArea(F32 area) { mPixelArea = area; } F32 getVirtualSize() const { return mVSize; } F32 getPixelArea() const { return mPixelArea; } - S32 getIndexInTex(U32 ch) const {llassert(ch < LLRender::NUM_TEXTURE_CHANNELS); return mIndexInTex[ch];} - void setIndexInTex(U32 ch, S32 index) { llassert(ch < LLRender::NUM_TEXTURE_CHANNELS); mIndexInTex[ch] = index ;} + S32 getIndexInTex(U32 ch) const { llassert(ch < LLRender::NUM_TEXTURE_CHANNELS); return mIndexInTex[ch]; } + void setIndexInTex(U32 ch, S32 index) { llassert(ch < LLRender::NUM_TEXTURE_CHANNELS); mIndexInTex[ch] = index; } void setWorldMatrix(const LLMatrix4& mat); const LLTextureEntry* getTextureEntry() const { return mVObjp->getTE(mTEOffset); } |