diff options
| author | Don Kjer <don@lindenlab.com> | 2007-07-02 17:10:30 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-07-02 17:10:30 +0000 |
| commit | e5124431b54d4342d4677371fccca5bc7250c079 (patch) | |
| tree | 8c9636e78e93cef6ed099d9abd72ec9ccbbf35fe /indra/newview/lltexlayer.cpp | |
| parent | ce5e13630cd8f4174549a3ec4ae8c24eec90bb3d (diff) | |
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/newview/lltexlayer.cpp')
| -rw-r--r-- | indra/newview/lltexlayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp index 11a95d4837..178c83f61e 100644 --- a/indra/newview/lltexlayer.cpp +++ b/indra/newview/lltexlayer.cpp @@ -2294,7 +2294,7 @@ LLColor4 LLTexParamColor::getNetColor() { llassert( getInfo()->mNumColors >= 1 ); - F32 effective_weight = ( mAvatar.notNull() && (mAvatar->getSex() & getSex()) ) ? mCurWeight : getDefaultWeight(); + F32 effective_weight = ( mAvatar && (mAvatar->getSex() & getSex()) ) ? mCurWeight : getDefaultWeight(); S32 index_last = getInfo()->mNumColors - 1; F32 scaled_weight = effective_weight * index_last; |