diff options
| author | Neal Orman <nyx@lindenlab.com> | 2009-07-14 17:14:40 +0000 |
|---|---|---|
| committer | Neal Orman <nyx@lindenlab.com> | 2009-07-14 17:14:40 +0000 |
| commit | 9ecdbd8b72fec5182d2a5f843c9e4a050069ed51 (patch) | |
| tree | f64fe8ba884f137afaf55ebe38e3f90150e00cab /indra/newview/lllocaltextureobject.cpp | |
| parent | 29e5f09d12e8a92e07f3bb9d2cf898cc0e3b06cf (diff) | |
QAR-1602 checkpoint for multiple textures
Fixing merge problems - updating LLLocalTextureObject (new class) to work with Bao's texture refactoring.
-Nyx
Diffstat (limited to 'indra/newview/lllocaltextureobject.cpp')
| -rw-r--r-- | indra/newview/lllocaltextureobject.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/lllocaltextureobject.cpp b/indra/newview/lllocaltextureobject.cpp index 8a40c80e76..e4a20aea68 100644 --- a/indra/newview/lllocaltextureobject.cpp +++ b/indra/newview/lllocaltextureobject.cpp @@ -34,7 +34,7 @@ #include "lllocaltextureobject.h" #include "lltexlayer.h" -#include "llviewerimage.h" +#include "llviewertexture.h" #include "lltextureentry.h" #include "lluuid.h" @@ -46,7 +46,7 @@ LLLocalTextureObject::LLLocalTextureObject() : mImage = NULL; } -LLLocalTextureObject::LLLocalTextureObject(LLViewerImage *image, LLTextureEntry *entry, LLTexLayer *layer, LLUUID id) +LLLocalTextureObject::LLLocalTextureObject(LLViewerFetchedTexture *image, LLTextureEntry *entry, LLTexLayer *layer, LLUUID id) { if (entry) { @@ -77,7 +77,7 @@ LLLocalTextureObject::~LLLocalTextureObject() { } -LLViewerImage* LLLocalTextureObject::getImage() const +LLViewerFetchedTexture* LLLocalTextureObject::getImage() const { return mImage; } @@ -107,7 +107,7 @@ BOOL LLLocalTextureObject::getBakedReady() const return mIsBakedReady; } -void LLLocalTextureObject::setImage(LLViewerImage* new_image) +void LLLocalTextureObject::setImage(LLViewerFetchedTexture* new_image) { mImage = new_image; } |