aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llrender/llrender.cpp
diff options
context:
space:
mode:
authorArmin Weatherwax2010-03-09 23:00:38 +0100
committerJacek Antonelli2010-06-19 02:43:01 -0500
commit523e0e2dff6af1c5bc12e2aefc0ca9b96bf26fd6 (patch)
treeefc2b1bf0b7ca57b4fcc5e64da555907437a408d /linden/indra/llrender/llrender.cpp
parentApplied patch by Kirstenlee Cinquetti for SNOW-493: LLDataPackerBinaryBuffer:... (diff)
downloadmeta-impy-523e0e2dff6af1c5bc12e2aefc0ca9b96bf26fd6.zip
meta-impy-523e0e2dff6af1c5bc12e2aefc0ca9b96bf26fd6.tar.gz
meta-impy-523e0e2dff6af1c5bc12e2aefc0ca9b96bf26fd6.tar.bz2
meta-impy-523e0e2dff6af1c5bc12e2aefc0ca9b96bf26fd6.tar.xz
Henri Beauchamp: Port of SG-2.0 alpha and tattoo layers (v6)
slviewer-0-v12350-AlphaAndTattooSupport-patch.zip contains the necessary avatar_lad.xml and other artwork. The new avatar_lad.xml crashes clients without alpha and tattoo support at startup.
Diffstat (limited to 'linden/indra/llrender/llrender.cpp')
-rw-r--r--linden/indra/llrender/llrender.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/linden/indra/llrender/llrender.cpp b/linden/indra/llrender/llrender.cpp
index 93ff822..b1fe153 100644
--- a/linden/indra/llrender/llrender.cpp
+++ b/linden/indra/llrender/llrender.cpp
@@ -799,6 +799,9 @@ void LLRender::setSceneBlendType(eBlendType type)
799 case BT_MULT: 799 case BT_MULT:
800 glBlendFunc(GL_DST_COLOR, GL_ZERO); 800 glBlendFunc(GL_DST_COLOR, GL_ZERO);
801 break; 801 break;
802 case BT_MULT_ALPHA:
803 glBlendFunc(GL_DST_ALPHA, GL_ZERO);
804 break;
802 case BT_MULT_X2: 805 case BT_MULT_X2:
803 glBlendFunc(GL_DST_COLOR, GL_SRC_COLOR); 806 glBlendFunc(GL_DST_COLOR, GL_SRC_COLOR);
804 break; 807 break;