diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-04-09 23:49:11 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-04-09 23:49:11 -0600 |
| commit | 0a80627bca63ee05ce07df510ebe2072399dd01d (patch) | |
| tree | 8af963a46af857daabc0a24f3aefe36ee141a09e /indra/newview/lltexlayer.cpp | |
| parent | 55ea80076bafcd1baf6a8ccf713267b8c2c24185 (diff) | |
| parent | d64ccab573e9455815dede58f8027a8f2337a728 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
Diffstat (limited to 'indra/newview/lltexlayer.cpp')
| -rw-r--r-- | indra/newview/lltexlayer.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp index 386b636367..8cb319b122 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() ; |