summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-01-10 00:48:31 -0800
committerRichard Linden <none@none>2013-01-10 00:48:31 -0800
commit2ac49344e1aea94a11ecdb07ac6043538246a2f6 (patch)
treee268ef1a5116760093fe4f4e132c0e3c0a74ccdc /indra/newview/llviewertexture.cpp
parentf8a2bca6526ea1eef61a9b8cf0fb2e78c2663d60 (diff)
parente28007f830a85b94adb7b787f18047780ac026ff (diff)
Automated merge with file:///d:%5Ccode%5Cviewer-interesting-metrics
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
-rw-r--r--indra/newview/llviewertexture.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 1ffa83c529..76210563bb 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -966,6 +966,12 @@ void LLViewerTexture::setCachedRawImage(S32 discard_level, LLImageRaw* imageraw)
//nothing here.
}
+BOOL LLViewerTexture::setSubImageFromFrameBuffer(S32 fb_x, S32 fb_y, S32 x_pos, S32 y_pos, S32 width, S32 height)
+{
+ llassert(mGLTexturep.notNull()) ;
+ return mGLTexturep->setSubImageFromFrameBuffer(fb_x, fb_y, x_pos, y_pos, width, height);
+}
+
void LLViewerTexture::setExplicitFormat(LLGLint internal_format, LLGLenum primary_format, LLGLenum type_format, BOOL swap_bytes)
{
llassert(mGLTexturep.notNull()) ;