diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-20 11:47:15 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-20 11:47:15 +0100 |
| commit | 191fc9095443c3f7daab42f5d8977efc83c9e6e4 (patch) | |
| tree | 2837aacd1966ea429ea450bb7869e5b6595db309 /indra/newview/llvoavatar.cpp | |
| parent | b430d1a9ceaf18f12cbaf0008a5d5454796741ea (diff) | |
| parent | ae0dbecb1c93347f7d83760117496048af3148da (diff) | |
merge from 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 04bd54ee0c..c998a593e5 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -4836,7 +4836,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; @@ -4846,7 +4846,7 @@ BOOL LLVOAvatar::loadAvatar() file << std::endl; } - file.close();*/ + file.close(); return TRUE; } @@ -6198,6 +6198,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; |