diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-11-08 14:01:01 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-11-08 14:01:01 -0500 |
| commit | f504270121075323b723407bcfaac1020d1a1a0d (patch) | |
| tree | f9475c61457a89ee12589045a1b3a382dbc4c804 /indra | |
| parent | 28c26cb491305525fb3f24ec2ef3bcb9b1ab8c5f (diff) | |
| parent | 7e0444cbe7643b119c9630e365002f4c46987fd7 (diff) | |
merge changes for storm-1678
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llworldmapview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp index 265d5dc801..e99657cd22 100644 --- a/indra/newview/llworldmapview.cpp +++ b/indra/newview/llworldmapview.cpp @@ -422,7 +422,7 @@ void LLWorldMapView::draw() // Draw something whenever we have enough info if (overlayimage->hasGLTexture()) { - gGL.blendFunc(LLRender::BF_DEST_ALPHA, LLRender::BF_ZERO); + gGL.blendFunc(LLRender::BF_SOURCE_ALPHA, LLRender::BF_ONE_MINUS_SOURCE_ALPHA); gGL.getTexUnit(0)->bind(overlayimage); gGL.color4f(1.f, 1.f, 1.f, 1.f); gGL.begin(LLRender::QUADS); |