diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-01-19 23:24:13 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-01-19 23:24:13 -0600 |
| commit | 1b2c082feb91b4837a0cb5652d1668f6582e9bc9 (patch) | |
| tree | 32179a4a46c263fbb73a9f9c727a6647841e79a5 /indra/newview/lldrawpoolbump.cpp | |
| parent | 17068766b75fbe7dac968705f4f383fb61f73eb4 (diff) | |
| parent | 32c4a448b113731a8c9ae32613fe4aa50b5c9997 (diff) | |
merge
Diffstat (limited to 'indra/newview/lldrawpoolbump.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index bd2c6e1c63..0afa8b1794 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -145,12 +145,7 @@ void LLStandardBumpmap::addstandard() // llinfos << "Loading bumpmap: " << bump_image_id << " from viewerart" << llendl; gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mLabel = label; gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mImage = - LLViewerTextureManager::getFetchedTexture(LLUUID(bump_image_id), - TRUE, - LLViewerTexture::BOOST_NONE, - LLViewerTexture::LOD_TEXTURE, - 0, - 0); + LLViewerTextureManager::getFetchedTexture(LLUUID(bump_image_id)); gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mImage->setBoostLevel(LLViewerTexture::BOOST_BUMP) ; gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mImage->setLoadedCallback(LLBumpImageList::onSourceStandardLoaded, 0, TRUE, FALSE, NULL, NULL ); LLStandardBumpmap::sStandardBumpmapCount++; |