summaryrefslogtreecommitdiff
path: root/indra/newview/lltexlayer.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-12 11:03:16 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-12 11:03:16 +0100
commit9fbe736774b1049265fd017bfe2413d436d35706 (patch)
tree2077c5ced76eed3d14c3340a9645306e99434bbb /indra/newview/lltexlayer.cpp
parent103083b52def07c140dfc8f28989b5f4a93d288a (diff)
parent0a80627bca63ee05ce07df510ebe2072399dd01d (diff)
(slightly hairy) merge from viewer-hotfix
Diffstat (limited to 'indra/newview/lltexlayer.cpp')
-rw-r--r--indra/newview/lltexlayer.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp
index 3f4dab4fea..492fb2ad52 100644
--- a/indra/newview/lltexlayer.cpp
+++ b/indra/newview/lltexlayer.cpp
@@ -99,6 +99,12 @@ LLTexLayerSetBuffer::~LLTexLayerSetBuffer()
}
//virtual
+S8 LLTexLayerSetBuffer::getType() const
+{
+ return LLViewerDynamicTexture::LL_TEX_LAYER_SET_BUFFER ;
+}
+
+//virtual
void LLTexLayerSetBuffer::restoreGLTexture()
{
LLViewerDynamicTexture::restoreGLTexture() ;