diff options
| author | simon <none@none> | 2014-03-26 10:04:53 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-03-26 10:04:53 -0700 |
| commit | 33dfc0a8a1ed56d7d24611981736fd5baf6b03c2 (patch) | |
| tree | 5dfdbcede0d8c689e796cf65ebc21bb149c17b8e /indra/newview/lldrawpoolbump.cpp | |
| parent | 00a325ccb90b1c6800ec78e1211b5097d9c27a58 (diff) | |
| parent | 5c20e06dbd0845e2d45daae610c43fc89e24028f (diff) | |
Pull in downstream -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(); |