diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-18 05:52:01 -0700 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-18 05:52:01 -0700 |
| commit | c3d1ed5b768b387961edfec124b645359563053f (patch) | |
| tree | 34c54f809bdd2eaa21ab2797a07a0ac3b611f9aa /indra/newview/llvovolume.cpp | |
| parent | 3803a5b5ae4e6937f0c09099a19af44272e09d81 (diff) | |
| parent | 9643dee27e8ec0bf73f72bfe5ab868bbca42d26b (diff) | |
merge back fixes from 3.3.4-beta5
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index f31f2320ba..d11f0bc351 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -1883,6 +1883,9 @@ S32 LLVOVolume::setTEColor(const U8 te, const LLColor4& color) if (color.mV[3] != old_alpha) { gPipeline.markTextured(mDrawable); + //treat this alpha change as an LoD update since render batches may need to get rebuilt + mLODChanged = TRUE; + gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, FALSE); } retval = LLPrimitive::setTEColor(te, color); if (mDrawable.notNull() && retval) @@ -1890,12 +1893,6 @@ S32 LLVOVolume::setTEColor(const U8 te, const LLColor4& color) // These should only happen on updates which are not the initial update. mDrawable->setState(LLDrawable::REBUILD_COLOR); dirtyMesh(); - - if (old_alpha >= 1.f || color.mV[3] <= 0.f) - { //treat this alpha change as an LoD update since render batches will need to get rebuilt - mLODChanged = TRUE; - gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, FALSE); - } } } |