diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-08-12 17:29:50 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-12 17:29:50 +0000 |
| commit | 80be4c1d2d73982ea2df6dd7ef3fc3465416c882 (patch) | |
| tree | 9c5958572368be494b6302db8b03967a2c67b7ad /indra/newview/lldrawpoolbump.cpp | |
| parent | a09f7d41efdb945755efaeb07f7418c1f6e2a78b (diff) | |
QAR-767 Combined maint-render-7 and maint-viewer-9 merge
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/lldrawpoolbump.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index 11391ee6fb..2f25c757cb 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -851,7 +851,7 @@ LLImageGL* LLBumpImageList::getBrightnessDarknessImage(LLViewerImage* src_image, bump->setExplicitFormat(GL_ALPHA8, GL_ALPHA); // Note: this may create an LLImageGL immediately - src_image->setLoadedCallback( callback_func, 0, TRUE, new LLUUID(src_image->getID()) ); + src_image->setLoadedCallback( callback_func, 0, TRUE, FALSE, new LLUUID(src_image->getID()) ); bump = (*entries_list)[src_image->getID()]; // In case callback was called immediately and replaced the image // bump_total++; |