diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2009-07-10 22:02:26 +0000 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2009-07-10 22:02:26 +0000 |
| commit | 77f56a3f3db72b2938eadb0868fc7be975dabafa (patch) | |
| tree | eb220e9890d0208969746a3e86fecf84b19e436b /indra/llui/lluiimage.cpp | |
| parent | e4dc104e3296319476bb0d6c327d6a326c967976 (diff) | |
merge QAR-1579: texture-cleanup-1.
Diffstat (limited to 'indra/llui/lluiimage.cpp')
| -rw-r--r-- | indra/llui/lluiimage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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), |