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 | c96caed698afb38c50db229fff35fa8b91e40f83 (patch) | |
tree | 62a847bc2cc299b6979e6ed143843c902efb7a33 /indra/newview/llviewertexture.cpp | |
parent | 0f2f597e7aa5011061c3ea1fef5867814ee3a5b2 (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 ; } |