From 101569202c8c004fe8e09e56435c50298aa2cb69 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Wed, 7 Feb 2018 16:55:43 +0200 Subject: MAINT-8270 Backed out changeset: 5d7cb87d01ef Default female sit has stopped working, system uses male sit MAINT-5013 needs to be fixed in a different way. --- indra/newview/llvoavatar.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llvoavatar.cpp') diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index eae8f2cc56..652a447545 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -5304,6 +5304,10 @@ LLUUID LLVOAvatar::remapMotionID(const LLUUID& id) if (use_new_walk_run) result = ANIM_AGENT_FEMALE_RUN_NEW; } + else if (id == ANIM_AGENT_SIT) + { + result = ANIM_AGENT_SIT_FEMALE; + } } else { -- cgit v1.2.3 From 2cd1460763090bcf6e7f408caf11c0ecd596520f Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Wed, 21 Feb 2018 15:10:40 +0200 Subject: MAINT-2564 FIXED Alpha mask does not hide hair in the Outfit Editor --- indra/newview/llvoavatar.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/llvoavatar.cpp') diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 652a447545..966fe45e34 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -7366,11 +7366,13 @@ 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()) + if (!is_layer_baked[BAKED_HAIR] || (isEditingAppearance() && !hair_alpha_exists)) { const LLColor4 color = mTexHairColor ? mTexHairColor->getColor() : LLColor4(1,1,1,1); LLViewerTexture* hair_img = getImage( TEX_HAIR, 0 ); -- cgit v1.2.3 From 20d7f6672274e2cb66279d54d340926f58dc6682 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Wed, 7 Mar 2018 17:26:51 +0200 Subject: MAINT-3399 Hairbase renders incorrectly in edit appearance mode --- indra/newview/llvoavatar.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'indra/newview/llvoavatar.cpp') 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 ); -- cgit v1.2.3