diff options
| author | Mark Palange <palange@lindenlab.com> | 2009-02-03 21:15:57 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2009-02-03 21:15:57 +0000 |
| commit | 46f8fb8781ccce338b4a88aaf8371ee3dec56d29 (patch) | |
| tree | b2dc09521a166d2181c48f4a4f1ca90b83b99477 /indra/newview/lldrawpoolbump.cpp | |
| parent | e188badaf29a1a02307f93864eed6737096bd9a1 (diff) | |
svn merge -r107016:108767 svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewer_1-22
Merge back of viewer 1.22 RC6 and RC7 change to trunk.
QAR-1214 and QAR-1227
Diffstat (limited to 'indra/newview/lldrawpoolbump.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index b23819be27..60c41159d2 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -593,7 +593,7 @@ BOOL LLDrawPoolBump::bindBumpMap(LLDrawInfo& params) if( bump_code < LLStandardBumpmap::sStandardBumpmapCount ) { bump = gStandardBumpmapList[bump_code].mImage; - gBumpImageList.addTextureStats(bump_code, tex->getID(), params.mVSize, 1, 1); + gBumpImageList.addTextureStats(bump_code, tex->getID(), params.mVSize); } break; } @@ -735,14 +735,13 @@ LLBumpImageList::~LLBumpImageList() // Note: Does nothing for entries in gStandardBumpmapList that are not actually standard bump images (e.g. none, brightness, and darkness) -void LLBumpImageList::addTextureStats(U8 bump, const LLUUID& base_image_id, - F32 pixel_area, F32 texel_area_ratio, F32 cos_center_angle) +void LLBumpImageList::addTextureStats(U8 bump, const LLUUID& base_image_id, F32 virtual_size) { bump &= TEM_BUMP_MASK; LLViewerImage* bump_image = gStandardBumpmapList[bump].mImage; if( bump_image ) { - bump_image->addTextureStats(pixel_area, texel_area_ratio, cos_center_angle); + bump_image->addTextureStats(virtual_size); } } |