diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-26 15:15:09 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-26 15:15:09 +0300 |
| commit | 27e17344842bc3986fde39473effd39999b02a2c (patch) | |
| tree | e5feb4bad38f49a84833e75c0e3947c97fa76701 /indra/newview/llvoavatar.cpp | |
| parent | 002bbd885b1e22db12229c3a8ffb6c4fdbfdfc5c (diff) | |
| parent | 6ad892aa95b50a4bbcd369657d47d428ee248f96 (diff) | |
Merge from default branch
--HG--
branch : product-engine
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; |