diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2010-05-19 12:16:20 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2010-05-19 12:16:20 -0400 |
| commit | 46fc55fca546ee8ac0db8cf69b136bc3e344eed1 (patch) | |
| tree | 47ebc8806fb3f088e9d0f05d2e11abc97c6d6c06 /indra/newview/llvoavatar.cpp | |
| parent | b550bb0f09197c35b80d18d540761a7831c3e89b (diff) | |
EXT-7208 FIX add color / tint to tattoos
Adds a color swatch to tattoo wearable that allows users to color their tattoos.
Defaults to white so should not affect existing tattoo wearables.
Code reviewed by Vir.
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 0f4623c678..4371396629 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -4886,7 +4886,7 @@ BOOL LLVOAvatar::loadAvatar() } // Uncomment to enable avatar_lad.xml debugging. -/* std::ofstream file; + std::ofstream file; file.open("avatar_lad.log"); for( LLViewerVisualParam* param = (LLViewerVisualParam*) getFirstVisualParam(); param; @@ -4896,7 +4896,7 @@ BOOL LLVOAvatar::loadAvatar() file << std::endl; } - file.close();*/ + file.close(); return TRUE; } @@ -6355,6 +6355,14 @@ BOOL LLVOAvatar::teToColorParams( ETextureIndex te, U32 *param_name ) param_name[2] = 923; //"skirt_blue"; break; + case TEX_HEAD_TATTOO: + case TEX_LOWER_TATTOO: + case TEX_UPPER_TATTOO: + param_name[0] = 1071; //"tattoo_red"; + param_name[1] = 1072; //"tattoo_green"; + param_name[2] = 1073; //"tattoo_blue"; + break; + default: llassert(0); return FALSE; |