diff options
| author | Richard Linden <none@none> | 2010-07-27 14:44:17 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-07-27 14:44:17 -0700 |
| commit | 28bd15d47d015798417f885926f692e8113fe054 (patch) | |
| tree | 62a847bc2cc299b6979e6ed143843c902efb7a33 /indra/newview/llvoavatar.h | |
| parent | b4dfa76c9de73c6bebf54d6112b699a1e654ba63 (diff) | |
| parent | 6cd862063d8e9ce68efd0e15aeb3da76160fcd81 (diff) | |
Merge from dessie/viewer-release
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rw-r--r-- | indra/newview/llvoavatar.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 4163810d6c..eb622ce7c7 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -623,7 +623,7 @@ private: public: void setClothesColor(LLVOAvatarDefines::ETextureIndex te, const LLColor4& new_color, BOOL upload_bake); LLColor4 getClothesColor(LLVOAvatarDefines::ETextureIndex te); - static BOOL teToColorParams(LLVOAvatarDefines::ETextureIndex te, U32 *param_name); + static BOOL teToColorParams(LLVOAvatarDefines::ETextureIndex te, U32 *param_name); //-------------------------------------------------------------------- // Global colors @@ -1049,7 +1049,7 @@ protected: // Shared with LLVOAvatarSelf *******************************************************************************/ }; // LLVOAvatar -extern const F32 SELF_ADDITIONAL_PRI; +extern const F32 SELF_ADDITIONAL_PRI; extern const S32 MAX_TEXTURE_VIRTURE_SIZE_RESET_INTERVAL; #endif // LL_VO_AVATAR_H |