diff options
| author | Richard Linden <none@none> | 2010-07-27 14:44:17 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-07-27 14:44:17 -0700 |
| commit | 28bd15d47d015798417f885926f692e8113fe054 (patch) | |
| tree | 62a847bc2cc299b6979e6ed143843c902efb7a33 /indra/newview/llviewertexture.cpp | |
| parent | b4dfa76c9de73c6bebf54d6112b699a1e654ba63 (diff) | |
| parent | 6cd862063d8e9ce68efd0e15aeb3da76160fcd81 (diff) | |
Merge from dessie/viewer-release
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index e38608bcfc..9d4f6fdd0c 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -2131,7 +2131,7 @@ void LLViewerFetchedTexture::deleteCallbackEntry(const LLLoadedCallbackEntry::so void LLViewerFetchedTexture::unpauseLoadedCallbacks(const LLLoadedCallbackEntry::source_callback_list_t* callback_list) { if(!callback_list) - { +{ mPauseLoadedCallBacks = FALSE ; return ; } @@ -2160,7 +2160,7 @@ void LLViewerFetchedTexture::unpauseLoadedCallbacks(const LLLoadedCallbackEntry: void LLViewerFetchedTexture::pauseLoadedCallbacks(const LLLoadedCallbackEntry::source_callback_list_t* callback_list) { if(!callback_list) - { +{ return ; } |