diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-06-27 17:18:00 -0400 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-06-27 17:18:00 -0400 |
| commit | 6dd8a02ed1fa4c34b477a1106333c12dc7efe5cd (patch) | |
| tree | 2d008a281c4c0a4d925bc6dec53e909259ddff42 /indra/newview/llfloatermodelpreview.cpp | |
| parent | db4994734dd485eda64cccc0c05b50aff82d3914 (diff) | |
| parent | 895db142ee9224e1b8e4d2fc6348dc1801bea0dc (diff) | |
Merge branch 'project/gltf_mesh_import' into geenz/develop-to-gltf-mesh
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
| -rw-r--r-- | indra/newview/llfloatermodelpreview.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 47471edb92..5cb5f8b961 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -64,6 +64,7 @@ #include "llcallbacklist.h" #include "llviewertexteditor.h" #include "llviewernetwork.h" +#include "llmaterialeditor.h" //static @@ -619,11 +620,9 @@ void LLFloaterModelPreview::onJointListSelection() LLPanel *panel = mTabContainer->getPanelByName("rigging_panel"); LLScrollListCtrl *joints_list = panel->getChild<LLScrollListCtrl>("joints_list"); LLScrollListCtrl *joints_pos = panel->getChild<LLScrollListCtrl>("pos_overrides_list"); - LLScrollListCtrl *joints_scale = panel->getChild<LLScrollListCtrl>("scale_overrides_list"); LLTextBox *joint_pos_descr = panel->getChild<LLTextBox>("pos_overrides_descr"); joints_pos->deleteAllItems(); - joints_scale->deleteAllItems(); LLScrollListItem *selected = joints_list->getFirstSelected(); if (selected) |