diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-18 03:10:25 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-18 03:10:25 -0400 |
| commit | f26dfe4fb9556dafb8931690441949ab55a3612b (patch) | |
| tree | 5b2052435be52cb758f3e080385062109ba4a54d | |
| parent | c906d640048645df2e4702914ca8ec46add34e6d (diff) | |
| parent | a93cb07df681109fc71f714b380e0f6fc7663fbe (diff) | |
merge changes for DRTVWR-184
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | indra/newview/llvovolume.cpp | 9 |
2 files changed, 4 insertions, 6 deletions
@@ -339,5 +339,6 @@ f91d003091a61937a044652c4c674447f7dcbb7a 3.3.4-beta1 eb539c65e6ee26eea2bf373af2d0f4b52dc91289 DRTVWR-177 a8057e1b9a1246b434a27405be35e030f7d28b0c 3.3.4-beta3 4281aa899fb2cedb7a9ca7ce91c5c29d4aa69594 DRTVWR-180 +9cd174d3a54d93d409a7c346a15b8bfb40fc58f4 DRTVWR-184 5c08e1d8edd871807153603b690e3ee9dbb548aa DRTVWR-183 6c75f220b103db1420919c8b635fe53e2177f318 3.3.4-beta4 diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 7ccb6dc8dc..5ea13ee0a6 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); - } } } |