diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-01-08 14:50:31 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-01-08 14:50:31 -0700 |
| commit | 8315e9745398c1c3215ffe1b3bfbfb6c7d16291d (patch) | |
| tree | 6e894381a62c0fb8656d2e0720b62d1beda3c06e /indra/newview/llviewertexture.h | |
| parent | 68413515029f50713c70e4adec3ce6fd1022d59f (diff) | |
| parent | 1fbd45672fcb1e5bfc194712fc7d0d4847a651cd (diff) | |
Merge
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); |