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.h | |
| parent | 204be2ba5261d794f8264e004b65725450bf1be9 (diff) | |
Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture
Diffstat (limited to 'indra/llappearance/lllocaltextureobject.h')
| -rw-r--r-- | indra/llappearance/lllocaltextureobject.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llappearance/lllocaltextureobject.h b/indra/llappearance/lllocaltextureobject.h index 8f868eb412..6f14448cca 100644 --- a/indra/llappearance/lllocaltextureobject.h +++ b/indra/llappearance/lllocaltextureobject.h @@ -30,7 +30,7 @@ #include <boost/shared_ptr.hpp> #include "llpointer.h" -#include "lltexture.h" +#include "llgltexture.h" class LLUUID; class LLTexLayer; @@ -44,11 +44,11 @@ class LLLocalTextureObject { public: LLLocalTextureObject(); - LLLocalTextureObject(LLTexture* image, const LLUUID& id); + LLLocalTextureObject(LLGLTexture* image, const LLUUID& id); LLLocalTextureObject(const LLLocalTextureObject& lto); ~LLLocalTextureObject(); - LLTexture* getImage() const; + LLGLTexture* getImage() const; LLTexLayer* getTexLayer(U32 index) const; LLTexLayer* getTexLayer(const std::string &name); U32 getNumTexLayers() const; @@ -56,7 +56,7 @@ public: S32 getDiscard() const; BOOL getBakedReady() const; - void setImage(LLTexture* new_image); + void setImage(LLGLTexture* new_image); BOOL setTexLayer(LLTexLayer *new_tex_layer, U32 index); BOOL addTexLayer(LLTexLayer *new_tex_layer, LLWearable *wearable); BOOL addTexLayer(LLTexLayerTemplate *new_tex_layer, LLWearable *wearable); @@ -70,7 +70,7 @@ protected: private: - LLPointer<LLTexture> mImage; + LLPointer<LLGLTexture> mImage; // NOTE: LLLocalTextureObject should be the exclusive owner of mTexEntry and mTexLayer // using shared pointers here only for smart assignment & cleanup // do NOT create new shared pointers to these objects, or keep pointers to them around |