diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-07-23 16:34:17 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-07-23 16:34:17 -0400 |
| commit | 0c5a5934d87cb7e64cb8db96551009b9b9ed8be9 (patch) | |
| tree | a8973a0ab6ec43469a71ea80e1d6328a9ad779de /indra/newview/llvoavatar.cpp | |
| parent | d9f01a7c5a70d184bb5fac1f620cfbe1ad4c957d (diff) | |
| parent | 056685d9d4ac82aad45e46ae5d5226690d416513 (diff) | |
merge
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 09a3b3b9ae..7079adbd14 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -6220,7 +6220,7 @@ void LLVOAvatar::updateMeshTextures() } } - const BOOL self_customizing = isSelf() && gAgentCamera.cameraCustomizeAvatar(); // During face edit mode, we don't use baked textures + const BOOL self_customizing = isSelf() && !gAgentAvatarp->isUsingBakedTextures(); // During face edit mode, we don't use baked textures const BOOL other_culled = !isSelf() && mCulled; LLLoadedCallbackEntry::source_callback_list_t* src_callback_list = NULL ; BOOL paused = FALSE; |