diff options
| author | Jacek Antonelli | 2008-08-15 23:44:59 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:44:59 -0500 |
| commit | a408bac29378072fbf36864164149458c978cfcc (patch) | |
| tree | 67feccf1a5d3816611ba48d6762f86f0f7f4b1f6 /linden/indra/newview/lltexlayer.cpp | |
| parent | Second Life viewer sources 1.17.0.12 (diff) | |
| download | meta-impy-a408bac29378072fbf36864164149458c978cfcc.zip meta-impy-a408bac29378072fbf36864164149458c978cfcc.tar.gz meta-impy-a408bac29378072fbf36864164149458c978cfcc.tar.bz2 meta-impy-a408bac29378072fbf36864164149458c978cfcc.tar.xz | |
Second Life viewer sources 1.17.1.0
Diffstat (limited to 'linden/indra/newview/lltexlayer.cpp')
| -rw-r--r-- | linden/indra/newview/lltexlayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/lltexlayer.cpp b/linden/indra/newview/lltexlayer.cpp index 2005e39..26ee098 100644 --- a/linden/indra/newview/lltexlayer.cpp +++ b/linden/indra/newview/lltexlayer.cpp | |||
| @@ -2314,7 +2314,7 @@ LLColor4 LLTexParamColor::getNetColor() | |||
| 2314 | { | 2314 | { |
| 2315 | llassert( getInfo()->mNumColors >= 1 ); | 2315 | llassert( getInfo()->mNumColors >= 1 ); |
| 2316 | 2316 | ||
| 2317 | F32 effective_weight = ( mAvatar && (mAvatar->getSex() & getSex()) ) ? mCurWeight : getDefaultWeight(); | 2317 | F32 effective_weight = ( mAvatar.notNull() && (mAvatar->getSex() & getSex()) ) ? mCurWeight : getDefaultWeight(); |
| 2318 | 2318 | ||
| 2319 | S32 index_last = getInfo()->mNumColors - 1; | 2319 | S32 index_last = getInfo()->mNumColors - 1; |
| 2320 | F32 scaled_weight = effective_weight * index_last; | 2320 | F32 scaled_weight = effective_weight * index_last; |