aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lldrawpoolbump.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:42 -0500
committerJacek Antonelli2008-08-15 23:45:42 -0500
commitce28e056c20bf2723f565bbf464b87781ec248a2 (patch)
treeef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/newview/lldrawpoolbump.cpp
parentSecond Life viewer sources 1.19.1.4b (diff)
downloadmeta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz
Second Life viewer sources 1.20.2
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/lldrawpoolbump.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/linden/indra/newview/lldrawpoolbump.cpp b/linden/indra/newview/lldrawpoolbump.cpp
index 0bfb737..2345406 100644
--- a/linden/indra/newview/lldrawpoolbump.cpp
+++ b/linden/indra/newview/lldrawpoolbump.cpp
@@ -141,7 +141,12 @@ void LLStandardBumpmap::restoreGL()
141 141
142// llinfos << "Loading bumpmap: " << bump_file << " from viewerart" << llendl; 142// llinfos << "Loading bumpmap: " << bump_file << " from viewerart" << llendl;
143 gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mLabel = label; 143 gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mLabel = label;
144 gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mImage = gImageList.getImage( LLUUID(gViewerArt.getString(bump_file)) ); 144 gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mImage =
145 gImageList.getImageFromFile(bump_file,
146 TRUE,
147 FALSE,
148 0,
149 0);
145 LLStandardBumpmap::sStandardBumpmapCount++; 150 LLStandardBumpmap::sStandardBumpmapCount++;
146 } 151 }
147 152