aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/llbutton.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:50 -0500
committerJacek Antonelli2008-08-15 23:45:50 -0500
commit2a4dea528f670b9bb1f77ef27a8a1dd16603d114 (patch)
tree95c68e362703c9099d571ecbdc6142b1cda1e005 /linden/indra/llui/llbutton.cpp
parentSecond Life viewer sources 1.20.6 (diff)
downloadmeta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.zip
meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.gz
meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.bz2
meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.xz
Second Life viewer sources 1.20.7
Diffstat (limited to '')
-rw-r--r--linden/indra/llui/llbutton.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/llui/llbutton.cpp b/linden/indra/llui/llbutton.cpp
index 3ada389..3eead67 100644
--- a/linden/indra/llui/llbutton.cpp
+++ b/linden/indra/llui/llbutton.cpp
@@ -48,7 +48,7 @@
48#include "llglheaders.h" 48#include "llglheaders.h"
49#include "llfocusmgr.h" 49#include "llfocusmgr.h"
50#include "llwindow.h" 50#include "llwindow.h"
51#include "llglimmediate.h" 51#include "llrender.h"
52 52
53static LLRegisterWidget<LLButton> r("button"); 53static LLRegisterWidget<LLButton> r("button");
54 54
@@ -574,9 +574,9 @@ void LLButton::draw()
574 mImagep->draw(getLocalRect(), getEnabled() ? mImageColor : mDisabledImageColor ); 574 mImagep->draw(getLocalRect(), getEnabled() ? mImageColor : mDisabledImageColor );
575 if (mCurGlowStrength > 0.01f) 575 if (mCurGlowStrength > 0.01f)
576 { 576 {
577 glBlendFunc(GL_SRC_ALPHA, GL_ONE); 577 gGL.setSceneBlendType(LLRender::BT_ADD_WITH_ALPHA);
578 mImagep->drawSolid(0, 0, getRect().getWidth(), getRect().getHeight(), LLColor4(1.f, 1.f, 1.f, mCurGlowStrength)); 578 mImagep->drawSolid(0, 0, getRect().getWidth(), getRect().getHeight(), LLColor4(1.f, 1.f, 1.f, mCurGlowStrength));
579 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 579 gGL.setSceneBlendType(LLRender::BT_ALPHA);
580 } 580 }
581 } 581 }
582 else 582 else
@@ -584,9 +584,9 @@ void LLButton::draw()
584 mImagep->draw(0, 0, getEnabled() ? mImageColor : mDisabledImageColor ); 584 mImagep->draw(0, 0, getEnabled() ? mImageColor : mDisabledImageColor );
585 if (mCurGlowStrength > 0.01f) 585 if (mCurGlowStrength > 0.01f)
586 { 586 {
587 glBlendFunc(GL_SRC_ALPHA, GL_ONE); 587 gGL.setSceneBlendType(LLRender::BT_ADD_WITH_ALPHA);
588 mImagep->drawSolid(0, 0, LLColor4(1.f, 1.f, 1.f, mCurGlowStrength)); 588 mImagep->drawSolid(0, 0, LLColor4(1.f, 1.f, 1.f, mCurGlowStrength));
589 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 589 gGL.setSceneBlendType(LLRender::BT_ALPHA);
590 } 590 }
591 } 591 }
592 } 592 }