diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-05-14 01:11:08 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-05-14 01:11:08 +0300 |
| commit | 28ae135375c42d6cfd89fc8d68cd80f4685b93eb (patch) | |
| tree | 5d7196c2a5e91ae364838a4db08e1e222dcd1736 /indra/newview | |
| parent | 58ceaacafd67d69deeeac8905ed46c2920eb2c4d (diff) | |
SL-16746 Hide hair and fix missing light for animation preview
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterbvhpreview.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llvoavatar.h | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llfloaterbvhpreview.cpp b/indra/newview/llfloaterbvhpreview.cpp index 0948847418..3d6defecd0 100644 --- a/indra/newview/llfloaterbvhpreview.cpp +++ b/indra/newview/llfloaterbvhpreview.cpp @@ -1051,6 +1051,7 @@ LLPreviewAnimation::LLPreviewAnimation(S32 width, S32 height) : LLViewerDynamicT // on idle overall apperance update will set skirt to visible, so either // call early or account for mSpecialRenderMode in updateMeshVisibility mDummyAvatar->updateOverallAppearance(); + mDummyAvatar->hideHair(); mDummyAvatar->hideSkirt(); // stop extraneous animations @@ -1142,6 +1143,7 @@ BOOL LLPreviewAnimation::render() { LLDrawPoolAvatar *avatarPoolp = (LLDrawPoolAvatar *)face->getPool(); avatarp->dirtyMesh(); + gPipeline.enableLightsPreview(); avatarPoolp->renderAvatars(avatarp); // renders only one avatar } } diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 249fae5441..c5c1c3b57a 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -7145,6 +7145,14 @@ LLViewerJoint* LLVOAvatar::getViewerJoint(S32 idx) } //----------------------------------------------------------------------------- +// hideHair() +//----------------------------------------------------------------------------- +void LLVOAvatar::hideHair() +{ + mMeshLOD[MESH_ID_HAIR]->setVisible(FALSE, TRUE); +} + +//----------------------------------------------------------------------------- // hideSkirt() //----------------------------------------------------------------------------- void LLVOAvatar::hideSkirt() diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index d6068f38b2..ca54397b9a 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -769,6 +769,7 @@ public: void parseAppearanceMessage(LLMessageSystem* mesgsys, LLAppearanceMessageContents& msg); void processAvatarAppearance(LLMessageSystem* mesgsys); void applyParsedAppearanceMessage(LLAppearanceMessageContents& contents, bool slam_params); + void hideHair(); void hideSkirt(); void startAppearanceAnimation(); |