diff options
| author | Tofu Buzzard <no-email> | 2011-03-04 19:32:58 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-03-04 19:32:58 -0800 |
| commit | ead14724086367fedc0be7385f823293a17dddce (patch) | |
| tree | 38cd71d58413a9e285d5b51016278ff8808d6537 /indra/newview | |
| parent | 59c3af8b40a6857871b81da85ca41554929373f2 (diff) | |
| parent | 78cc3211275cad68cf4cd1a0a1d72dba9dae470d (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index 0afa8b1794..38ff3083ce 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -1121,7 +1121,11 @@ void LLBumpImageList::onSourceLoaded( BOOL success, LLViewerTexture *src_vi, LLI { bump_image_map_t& entries_list(bump_code == BE_BRIGHTNESS ? gBumpImageList.mBrightnessEntries : gBumpImageList.mDarknessEntries ); bump_image_map_t::iterator iter = entries_list.find(source_asset_id); - if (iter != entries_list.end()) // bump not cached yet + + if (iter != entries_list.end() || + iter->second.isNull() || + iter->second->getWidth() != src->getWidth() || + iter->second->getHeight() != src->getHeight()) // bump not cached yet or has changed resolution { LLPointer<LLImageRaw> dst_image = new LLImageRaw(src->getWidth(), src->getHeight(), 1); U8* dst_data = dst_image->getData(); |