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.h | |
| parent | a09719c0eb8d06d6bb689984a1b108932ea35314 (diff) | |
| parent | c539004c7ebec31d7e61209e7110ec96c867aaa6 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/newview/llviewertexture.h')
| -rwxr-xr-x | indra/newview/llviewertexture.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index 837d4b21a2..0a9778ce76 100755 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -212,6 +212,7 @@ public: BOOL createGLTexture(S32 discard_level, const LLImageRaw* imageraw, S32 usename = 0, BOOL to_create = TRUE, S32 category = LLViewerTexture::OTHER); virtual void setCachedRawImage(S32 discard_level, LLImageRaw* imageraw) ; + BOOL setSubImageFromFrameBuffer(S32 fb_x, S32 fb_y, S32 x_pos, S32 y_pos, S32 width, S32 height); void setFilteringOption(LLTexUnit::eTextureFilterOptions option); void setExplicitFormat(LLGLint internal_format, LLGLenum primary_format, LLGLenum type_format = 0, BOOL swap_bytes = FALSE); void setAddressMode(LLTexUnit::eTextureAddressMode mode); |