diff options
| author | Richard Linden <none@none> | 2013-01-09 23:08:32 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-09 23:08:32 -0800 |
| commit | 0f3411f2b4b95336dcc96950459396d780a43049 (patch) | |
| tree | 53b5a75c9fcd0bf1e65af1e3af795cbf2794d608 /indra/newview/llviewertexture.cpp | |
| parent | a09719c0eb8d06d6bb689984a1b108932ea35314 (diff) | |
| parent | c539004c7ebec31d7e61209e7110ec96c867aaa6 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 6 |
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()) ; |