diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2018-03-07 17:26:51 +0200 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2018-03-07 17:26:51 +0200 |
| commit | 20d7f6672274e2cb66279d54d340926f58dc6682 (patch) | |
| tree | 79d3ef2ac011db0a035ac8361a8c9abd8751ba3d /indra/newview/llvoavatar.cpp | |
| parent | 2093275ad500a64db7bb14ff5a530fe0386890a2 (diff) | |
MAINT-3399 Hairbase renders incorrectly in edit appearance mode
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 966fe45e34..d7a24c6823 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -7366,13 +7366,11 @@ void LLVOAvatar::updateMeshTextures() debugColorizeSubMeshes(i,LLColor4::blue); } } - static LLUUID default_alpha_uuid = LLUUID(gSavedSettings.getString("UIImgDefaultAlphaUUID")); - bool hair_alpha_exists = (getImage(TEX_HAIR_ALPHA, 0) && getImage(TEX_HAIR_ALPHA, 0)->getID() != default_alpha_uuid); // set texture and color of hair manually if we are not using a baked image. // This can happen while loading hair for yourself, or for clients that did not // bake a hair texture. Still needed for yourself after 1.22 is depricated. - if (!is_layer_baked[BAKED_HAIR] || (isEditingAppearance() && !hair_alpha_exists)) + if (!is_layer_baked[BAKED_HAIR]) { const LLColor4 color = mTexHairColor ? mTexHairColor->getColor() : LLColor4(1,1,1,1); LLViewerTexture* hair_img = getImage( TEX_HAIR, 0 ); |