From f89f19990cbb9f3f2e7473ac6c159098bdfabec7 Mon Sep 17 00:00:00 2001
From: Mark Palange <palange@lindenlab.com>
Date: Fri, 7 Nov 2008 17:51:03 +0000
Subject: QAR-992 Merging revisions 101012-101170,101686-101687 of
 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into
 linden/release

---
 indra/llui/llscrolllistctrl.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/llui/llscrolllistctrl.cpp')

diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index ebfdda3027..c0f21ba9e5 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -435,7 +435,7 @@ void LLScrollListItem::draw(const LLRect& rect, const LLColor4& fg_color, const
 	// draw background rect
 	LLRect bg_rect = rect;
 	{
-		LLGLSNoTexture no_texture;
+		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 		gGL.color4fv(bg_color.mV);
 		gl_rect_2d( bg_rect );
 	}
@@ -1758,7 +1758,7 @@ void LLScrollListCtrl::draw()
 	// Draw background
 	if (mBackgroundVisible)
 	{
-		LLGLSNoTexture no_texture;
+		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 		gGL.color4fv( getEnabled() ? mBgWriteableColor.mV : mBgReadOnlyColor.mV );
 		gl_rect_2d(background);
 	}
-- 
cgit v1.2.3