diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2010-05-19 19:49:50 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2010-05-19 19:49:50 -0400 |
| commit | b9096fc954d615a9eff44c3e9bfe1c7d9cadd87a (patch) | |
| tree | cfbba634d4ef9b9ba40e00e8dee179a7423b199c /indra/newview/llvoavatar.cpp | |
| parent | 8c4ec8ac9da1845a4aa78a6a38f64b5fc17b2a90 (diff) | |
| parent | 8487341b0f255e65044c3f7e3dc09461b4e2351e (diff) | |
automated merge with viewer-public
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; |