diff options
| author | Jacek Antonelli | 2008-10-17 20:15:09 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-17 20:15:09 -0500 |
| commit | c4ea23e62280445bcce20aafe3a97b38bbdd9b0d (patch) | |
| tree | 70f45a226712ac617d185623bd74205f5d3ee5bf /linden/indra/newview/lldrawpoolbump.cpp | |
| parent | Merge branch 'merge-1.21.6' into rebranding (diff) | |
| parent | windows compile fix and rebranded help menu (diff) | |
| download | meta-impy-c4ea23e62280445bcce20aafe3a97b38bbdd9b0d.zip meta-impy-c4ea23e62280445bcce20aafe3a97b38bbdd9b0d.tar.gz meta-impy-c4ea23e62280445bcce20aafe3a97b38bbdd9b0d.tar.bz2 meta-impy-c4ea23e62280445bcce20aafe3a97b38bbdd9b0d.tar.xz | |
Merge commit 'mccabe/rebranding' into rebranding
Diffstat (limited to 'linden/indra/newview/lldrawpoolbump.cpp')
| -rw-r--r-- | linden/indra/newview/lldrawpoolbump.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/lldrawpoolbump.cpp b/linden/indra/newview/lldrawpoolbump.cpp index 0dd11d6..73d88f7 100644 --- a/linden/indra/newview/lldrawpoolbump.cpp +++ b/linden/indra/newview/lldrawpoolbump.cpp | |||
| @@ -139,7 +139,7 @@ void LLStandardBumpmap::restoreGL() | |||
| 139 | return; | 139 | return; |
| 140 | } | 140 | } |
| 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 = | 144 | gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mImage = |
| 145 | gImageList.getImageFromFile(bump_file, | 145 | gImageList.getImageFromFile(bump_file, |