summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolbump.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/lldrawpoolbump.cpp')
-rw-r--r--indra/newview/lldrawpoolbump.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp
index f4bc157168..4a9d8d1ec9 100644
--- a/indra/newview/lldrawpoolbump.cpp
+++ b/indra/newview/lldrawpoolbump.cpp
@@ -141,7 +141,12 @@ void LLStandardBumpmap::restoreGL()
// llinfos << "Loading bumpmap: " << bump_file << " from viewerart" << llendl;
gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mLabel = label;
- gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mImage = gImageList.getImage( LLUUID(gViewerArt.getString(bump_file)) );
+ gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mImage =
+ gImageList.getImageFromFile(bump_file,
+ TRUE,
+ FALSE,
+ 0,
+ 0);
LLStandardBumpmap::sStandardBumpmapCount++;
}