diff options
| author | Jacek Antonelli | 2008-09-06 18:24:57 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-09-06 18:25:07 -0500 |
| commit | 798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch) | |
| tree | 1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/lldrawpoolbump.h | |
| parent | Second Life viewer sources 1.20.15 (diff) | |
| download | meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2 meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz | |
Second Life viewer sources 1.21.0-RC
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/lldrawpoolbump.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/lldrawpoolbump.h b/linden/indra/newview/lldrawpoolbump.h index 246f5f3..fd6e22c 100644 --- a/linden/indra/newview/lldrawpoolbump.h +++ b/linden/indra/newview/lldrawpoolbump.h | |||
| @@ -96,9 +96,9 @@ class LLStandardBumpmap | |||
| 96 | { | 96 | { |
| 97 | public: | 97 | public: |
| 98 | LLStandardBumpmap() : mLabel() {} | 98 | LLStandardBumpmap() : mLabel() {} |
| 99 | LLStandardBumpmap( const char* label ) : mLabel(label) {} | 99 | LLStandardBumpmap( const std::string& label ) : mLabel(label) {} |
| 100 | 100 | ||
| 101 | LLString mLabel; | 101 | std::string mLabel; |
| 102 | LLPointer<LLViewerImage> mImage; | 102 | LLPointer<LLViewerImage> mImage; |
| 103 | 103 | ||
| 104 | static U32 sStandardBumpmapCount; // Number of valid values in gStandardBumpmapList[] | 104 | static U32 sStandardBumpmapCount; // Number of valid values in gStandardBumpmapList[] |