diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-03-04 18:46:26 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-03-04 18:46:26 -0600 |
| commit | ec11823c77ac232d59f4b9ddcff354523b6e0f73 (patch) | |
| tree | 1293f98fa36bc805eeffe107493dd6c899f80c3f /indra/newview/lldrawpoolbump.cpp | |
| parent | 04284652cfce57b0df3bc6b12f7568fa8da22ebb (diff) | |
SH-1069 Fix for some bump maps not loading fully.
(transplanted from 1a03c3745cbbe47e5cc5dfec3a9114516865ddc0)
Diffstat (limited to 'indra/newview/lldrawpoolbump.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index 0a642f494b..3f5cb4778e 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -1126,7 +1126,9 @@ void LLBumpImageList::onSourceLoaded( BOOL success, LLViewerTexture *src_vi, LLI bump_image_map_t::iterator iter = entries_list.find(source_asset_id); if (iter == entries_list.end() || - iter->second.isNull()) + iter->second.isNull() || + iter->second->getWidth() != src->getWidth() || + iter->second->getHeight() != src->getHeight()) // bump not cached yet or has changed resolution { //make sure an entry exists for this image LLPointer<LLImageRaw> raw = new LLImageRaw(1,1,1); raw->clear(0x77, 0x77, 0xFF, 0xFF); |