diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-02-19 18:03:52 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-02-19 18:03:52 -0600 |
| commit | 615babe6187e14ece4a43ce713f9dfadf90de9d3 (patch) | |
| tree | ce895186849518b6ff7395f3153a8e5f4917e673 /indra/newview/llviewertexture.h | |
| parent | e09d45aef8e2d2167e2020a328c0606c8c2f492c (diff) | |
| parent | 7f36a12cbbbf4bd914d0890bd6235425753140eb (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewertexture.h')
| -rw-r--r-- | indra/newview/llviewertexture.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index 85f03b5839..79db754072 100644 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -198,6 +198,7 @@ public: LLGLuint getTexName() const ; BOOL createGLTexture() ; 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) ; void setFilteringOption(LLTexUnit::eTextureFilterOptions option); void setExplicitFormat(LLGLint internal_format, LLGLenum primary_format, LLGLenum type_format = 0, BOOL swap_bytes = FALSE); @@ -423,6 +424,7 @@ public: LLImageRaw* reloadRawImage(S8 discard_level) ; void destroyRawImage(); + /*virtual*/ void setCachedRawImage(S32 discard_level, LLImageRaw* imageraw) ; const std::string& getUrl() const {return mUrl;} //--------------- |