diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-01 09:41:10 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-01 09:41:10 -0400 |
| commit | 4bce553a96dc6d75279f2c2b35fb8060a3f6bae1 (patch) | |
| tree | 70c1b0c2b43f2649777eb8cac7eb927906034640 /indra/newview/llviewertexturelist.h | |
| parent | a1fb8ae0d0679499a68fb8dd1965ab5026878c73 (diff) | |
| parent | 662a92784328f31b680f4f049350dd0f6cacf4c7 (diff) | |
merge viewer-development -> mesh-development
Diffstat (limited to 'indra/newview/llviewertexturelist.h')
| -rw-r--r-- | indra/newview/llviewertexturelist.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llviewertexturelist.h b/indra/newview/llviewertexturelist.h index d02b6be6b5..7f4dd0ae88 100644 --- a/indra/newview/llviewertexturelist.h +++ b/indra/newview/llviewertexturelist.h @@ -121,8 +121,8 @@ private: void addImage(LLViewerFetchedTexture *image); void deleteImage(LLViewerFetchedTexture *image); - void addImageToList(LLViewerFetchedTexture *image, U32 thread_id = LLThread::currentID()); - void removeImageFromList(LLViewerFetchedTexture *image, U32 thread_id = LLThread::currentID()); + void addImageToList(LLViewerFetchedTexture *image); + void removeImageFromList(LLViewerFetchedTexture *image); LLViewerFetchedTexture * getImage(const LLUUID &image_id, BOOL usemipmap = TRUE, @@ -208,9 +208,6 @@ public: private: static S32 sNumImages; static void (*sUUIDCallback)(void**, const LLUUID &); - - //debug use - static U32 sRenderThreadID; }; class LLUIImageList : public LLImageProviderInterface, public LLSingleton<LLUIImageList> |