From 636e20be10c474adcac5a647e0668c58bfa0c443 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 17 Jul 2012 13:00:33 -0500
Subject: MAINT-1223 More aggressive rebuilding of render batches when alpha
color values change.
---
indra/newview/llvovolume.cpp | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
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);
- }
}
}
--
cgit v1.2.3
From a93cb07df681109fc71f714b380e0f6fc7663fbe Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 18 Jul 2012 03:09:09 -0400
Subject: tag merge of DRTVWR-184
---
.hgtags | 1 +
1 file changed, 1 insertion(+)
diff --git a/.hgtags b/.hgtags
index bf98b38894..b03403a6bc 100644
--- a/.hgtags
+++ b/.hgtags
@@ -338,3 +338,4 @@ f91d003091a61937a044652c4c674447f7dcbb7a 3.3.4-beta1
82b5330bc8b17d0d4b598832e9c5a92e90075682 3.3.4-beta2
eb539c65e6ee26eea2bf373af2d0f4b52dc91289 DRTVWR-177
a8057e1b9a1246b434a27405be35e030f7d28b0c 3.3.4-beta3
+9cd174d3a54d93d409a7c346a15b8bfb40fc58f4 DRTVWR-184
--
cgit v1.2.3
From 9643dee27e8ec0bf73f72bfe5ab868bbca42d26b Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 18 Jul 2012 05:41:55 -0700
Subject: Added tag 3.3.4-beta5 for changeset ab2ffc547c8a
---
.hgtags | 1 +
1 file changed, 1 insertion(+)
diff --git a/.hgtags b/.hgtags
index d4f5788c0f..38bb1ad504 100644
--- a/.hgtags
+++ b/.hgtags
@@ -342,3 +342,4 @@ a8057e1b9a1246b434a27405be35e030f7d28b0c 3.3.4-beta3
9cd174d3a54d93d409a7c346a15b8bfb40fc58f4 DRTVWR-184
5c08e1d8edd871807153603b690e3ee9dbb548aa DRTVWR-183
6c75f220b103db1420919c8b635fe53e2177f318 3.3.4-beta4
+ab2ffc547c8a8950ff187c4f6c95e5334fab597b 3.3.4-beta5
--
cgit v1.2.3