diff options
author | brad kittenbrink <brad@lindenlab.com> | 2009-12-07 12:20:47 -0800 |
---|---|---|
committer | brad kittenbrink <brad@lindenlab.com> | 2009-12-07 12:20:47 -0800 |
commit | 8e912657e87549fb4d4cf05ab72d7cc4101ad066 (patch) | |
tree | 88bc0797a334a12a5d47be052ad0e125773e0858 /indra/newview/llviewertexture.h | |
parent | ee159d8e742a7281f304fc45b692c111706d294e (diff) | |
parent | bf4f21ecf87f9733ae25a2b9ae358efa0c654173 (diff) |
Another merge of include dependency cleanup work with viewer-2-0.
Diffstat (limited to 'indra/newview/llviewertexture.h')
-rw-r--r-- | indra/newview/llviewertexture.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index 141979052d..d6fbd5d570 100644 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -49,12 +49,14 @@ class LLFace; class LLImageGL ; +class LLImageRaw; class LLViewerObject; class LLViewerTexture; class LLViewerFetchedTexture ; class LLViewerMediaTexture ; class LLTexturePipelineTester ; + typedef void (*loaded_callback_func)( BOOL success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* src_aux, S32 discard_level, BOOL final, void* userdata ); class LLVFile; @@ -68,14 +70,7 @@ public: LLLoadedCallbackEntry(loaded_callback_func cb, S32 discard_level, BOOL need_imageraw, // Needs image raw for the callback - void* userdata ) - : mCallback(cb), - mLastUsedDiscard(MAX_DISCARD_LEVEL+1), - mDesiredDiscard(discard_level), - mNeedsImageRaw(need_imageraw), - mUserData(userdata) - { - } + void* userdata ); loaded_callback_func mCallback; S32 mLastUsedDiscard; |