aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/llscrollbar.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/llscrollbar.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 'linden/indra/llui/llscrollbar.cpp')
-rw-r--r--linden/indra/llui/llscrollbar.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/llui/llscrollbar.cpp b/linden/indra/llui/llscrollbar.cpp
index 8940b80..3d412c1 100644
--- a/linden/indra/llui/llscrollbar.cpp
+++ b/linden/indra/llui/llscrollbar.cpp
@@ -46,7 +46,7 @@
46#include "llwindow.h" 46#include "llwindow.h"
47#include "llglheaders.h" 47#include "llglheaders.h"
48#include "llcontrol.h" 48#include "llcontrol.h"
49#include "llglimmediate.h" 49#include "llrender.h"
50 50
51LLScrollbar::LLScrollbar( 51LLScrollbar::LLScrollbar(
52 const LLString& name, LLRect rect, 52 const LLString& name, LLRect rect,
@@ -520,9 +520,9 @@ void LLScrollbar::draw()
520 rounded_rect_imagep->draw(mThumbRect, mThumbColor); 520 rounded_rect_imagep->draw(mThumbRect, mThumbColor);
521 if (mCurGlowStrength > 0.01f) 521 if (mCurGlowStrength > 0.01f)
522 { 522 {
523 glBlendFunc(GL_SRC_ALPHA, GL_ONE); 523 gGL.setSceneBlendType(LLRender::BT_ADD_WITH_ALPHA);
524 rounded_rect_imagep->drawSolid(mThumbRect, LLColor4(1.f, 1.f, 1.f, mCurGlowStrength)); 524 rounded_rect_imagep->drawSolid(mThumbRect, LLColor4(1.f, 1.f, 1.f, mCurGlowStrength));
525 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 525 gGL.setSceneBlendType(LLRender::BT_ALPHA);
526 } 526 }
527 527
528 } 528 }