diff options
| author | simon <none@none> | 2014-03-26 10:08:19 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-03-26 10:08:19 -0700 |
| commit | 70006f4a5651ebaa0362ec2f95b5dda13f72e5c7 (patch) | |
| tree | 6e1f7e8ccea28fa830bca7f2508a626f6ca907c9 /indra/newview/lldrawpoolbump.cpp | |
| parent | 73ef75498692e7b7cecb4960f4e308061917d86e (diff) | |
| parent | 33dfc0a8a1ed56d7d24611981736fd5baf6b03c2 (diff) | |
Pull in downstream -tiger, -bear, viewer-release and become version 3.7.5
Diffstat (limited to 'indra/newview/lldrawpoolbump.cpp')
| -rwxr-xr-x | indra/newview/lldrawpoolbump.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index 79a81cedda..24fe1dd75f 100755 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -1232,6 +1232,7 @@ void LLBumpImageList::onSourceLoaded( BOOL success, LLViewerTexture *src_vi, LLI //if (iter->second->getWidth() != src->getWidth() || // iter->second->getHeight() != src->getHeight()) // bump not cached yet or has changed resolution + if (src->getData()) { LLPointer<LLImageRaw> dst_image = new LLImageRaw(src->getWidth(), src->getHeight(), 1); U8* dst_data = dst_image->getData(); |