diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-04 17:43:08 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-04 17:43:08 +0000 |
| commit | 1f6e20c5bbfd4495e6493facd2363fd133fe7fcd (patch) | |
| tree | 8ed8cf0f52ca0eeaf8df00b164c2f3f7970fe8a3 /indra/llappearance/lllocaltextureobject.cpp | |
| parent | 204be2ba5261d794f8264e004b65725450bf1be9 (diff) | |
Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture
Diffstat (limited to 'indra/llappearance/lllocaltextureobject.cpp')
| -rw-r--r-- | indra/llappearance/lllocaltextureobject.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llappearance/lllocaltextureobject.cpp b/indra/llappearance/lllocaltextureobject.cpp index 0e77444f49..7e36a06797 100644 --- a/indra/llappearance/lllocaltextureobject.cpp +++ b/indra/llappearance/lllocaltextureobject.cpp @@ -30,7 +30,7 @@ #include "llimage.h" #include "llrender.h" #include "lltexlayer.h" -#include "lltexture.h" +#include "llgltexture.h" #include "lluuid.h" #include "llwearable.h" @@ -42,7 +42,7 @@ LLLocalTextureObject::LLLocalTextureObject() : mImage = NULL; } -LLLocalTextureObject::LLLocalTextureObject(LLTexture* image, const LLUUID& id) : +LLLocalTextureObject::LLLocalTextureObject(LLGLTexture* image, const LLUUID& id) : mIsBakedReady(FALSE), mDiscard(MAX_DISCARD_LEVEL+1) { @@ -78,7 +78,7 @@ LLLocalTextureObject::~LLLocalTextureObject() { } -LLTexture* LLLocalTextureObject::getImage() const +LLGLTexture* LLLocalTextureObject::getImage() const { return mImage; } @@ -127,7 +127,7 @@ BOOL LLLocalTextureObject::getBakedReady() const return mIsBakedReady; } -void LLLocalTextureObject::setImage(LLTexture* new_image) +void LLLocalTextureObject::setImage(LLGLTexture* new_image) { mImage = new_image; } |