From 38bc052ec69f3785584f0c94f209dac7224db5fa Mon Sep 17 00:00:00 2001 From: Anchor Date: Mon, 4 Feb 2019 00:46:48 -0800 Subject: [SL-10079] - animesh handling for baked images --- indra/newview/llpanelvolume.cpp | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'indra/newview/llpanelvolume.cpp') diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp index 96dd309fa4..cd36c8f3f2 100644 --- a/indra/newview/llpanelvolume.cpp +++ b/indra/newview/llpanelvolume.cpp @@ -383,6 +383,26 @@ void LLPanelVolume::getState( ) } } getChildView("Animated Mesh Checkbox Ctrl")->setEnabled(enabled_animated_object_box); + + //refresh any bakes + if (root_volobjp) + { + root_volobjp->refreshBakeTexture(); + + LLViewerObject::const_child_list_t& child_list = root_volobjp->getChildren(); + for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin(); + iter != child_list.end(); ++iter) + { + LLViewerObject* objectp = *iter; + if (objectp) + { + objectp->refreshBakeTexture(); + } + } + + gAgentAvatarp->updateMeshVisibility(); + } + // Flexible properties BOOL is_flexible = volobjp && volobjp->isFlexible(); @@ -953,6 +973,25 @@ void LLPanelVolume::onCommitAnimatedMeshCheckbox(LLUICtrl *, void*) { volobjp->setExtendedMeshFlags(new_flags); } + + //refresh any bakes + if (volobjp) + { + volobjp->refreshBakeTexture(); + + LLViewerObject::const_child_list_t& child_list = volobjp->getChildren(); + for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin(); + iter != child_list.end(); ++iter) + { + LLViewerObject* objectp = *iter; + if (objectp) + { + objectp->refreshBakeTexture(); + } + } + + gAgentAvatarp->updateMeshVisibility(); + } } void LLPanelVolume::onCommitIsFlexible(LLUICtrl *, void*) -- cgit v1.2.3 From 1b449fa055ea6c85b464bc799f196e0ab3b7026e Mon Sep 17 00:00:00 2001 From: Anchor Date: Wed, 20 Feb 2019 08:39:58 +0530 Subject: [SL-10079] - added null check --- indra/newview/llpanelvolume.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'indra/newview/llpanelvolume.cpp') diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp index cd36c8f3f2..735eaa423d 100644 --- a/indra/newview/llpanelvolume.cpp +++ b/indra/newview/llpanelvolume.cpp @@ -400,7 +400,10 @@ void LLPanelVolume::getState( ) } } - gAgentAvatarp->updateMeshVisibility(); + if (gAgentAvatarp) + { + gAgentAvatarp->updateMeshVisibility(); + } } @@ -990,7 +993,10 @@ void LLPanelVolume::onCommitAnimatedMeshCheckbox(LLUICtrl *, void*) } } - gAgentAvatarp->updateMeshVisibility(); + if (gAgentAvatarp) + { + gAgentAvatarp->updateMeshVisibility(); + } } } -- cgit v1.2.3