diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-06 22:43:38 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-06 22:43:38 +0000 |
| commit | ad332810078a0bbb8fa08fcbfdf3d756de6914f6 (patch) | |
| tree | 1608b2db5d620d323673607ea7ddadfba9d58bda /indra/llui/llscrollbar.cpp | |
| parent | a7d9a543e587ffe84b355db7a2e8193bfe6c68b6 (diff) | |
QAR-650 - Viewer RC 9 merge -> release (post cmake)
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
Diffstat (limited to 'indra/llui/llscrollbar.cpp')
| -rw-r--r-- | indra/llui/llscrollbar.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llscrollbar.cpp b/indra/llui/llscrollbar.cpp index 3536e6bb03..5bc2c5cf85 100644 --- a/indra/llui/llscrollbar.cpp +++ b/indra/llui/llscrollbar.cpp @@ -44,7 +44,7 @@ #include "llfocusmgr.h" #include "llwindow.h" #include "llcontrol.h" -#include "llglimmediate.h" +#include "llrender.h" LLScrollbar::LLScrollbar( const LLString& name, LLRect rect, @@ -518,9 +518,9 @@ void LLScrollbar::draw() rounded_rect_imagep->draw(mThumbRect, mThumbColor); if (mCurGlowStrength > 0.01f) { - glBlendFunc(GL_SRC_ALPHA, GL_ONE); + gGL.setSceneBlendType(LLRender::BT_ADD_WITH_ALPHA); rounded_rect_imagep->drawSolid(mThumbRect, LLColor4(1.f, 1.f, 1.f, mCurGlowStrength)); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + gGL.setSceneBlendType(LLRender::BT_ALPHA); } } |