From 77f56a3f3db72b2938eadb0868fc7be975dabafa Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Fri, 10 Jul 2009 22:02:26 +0000
Subject: merge QAR-1579: texture-cleanup-1.

---
 indra/llui/lluiimage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/llui/lluiimage.cpp b/indra/llui/lluiimage.cpp
index 84bc2d1bab..ab0d65e731 100644
--- a/indra/llui/lluiimage.cpp
+++ b/indra/llui/lluiimage.cpp
@@ -39,7 +39,7 @@
 #include "lluiimage.h"
 #include "llui.h"
 
-LLUIImage::LLUIImage(const std::string& name, LLPointer<LLImageGL> image) :
+LLUIImage::LLUIImage(const std::string& name, LLPointer<LLTexture> image) :
 						mName(name),
 						mImage(image),
 						mScaleRegion(0.f, 1.f, 1.f, 0.f),
-- 
cgit v1.2.3