diff options
Diffstat (limited to 'linden/indra/newview/lldrawpoolbump.h')
-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[] |