diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-07-05 16:58:00 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-07-05 16:58:00 -0400 |
| commit | 2997e5cd24dc5a671cea7281eb9d11e1146fc28c (patch) | |
| tree | 9b350513117db2cb40fc2d3de69bd5331b015b94 /indra/newview/llviewertexturelist.h | |
| parent | 975975029d7f248cdf917da670ffd6c6b98d40c1 (diff) | |
| parent | 662a92784328f31b680f4f049350dd0f6cacf4c7 (diff) | |
Merge.
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> |