From 0570d6d3c1b56ebcd0309153ec0cebc7586a6286 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 27 Jul 2020 22:32:49 +0300 Subject: SL-13483 Rename Avatar tab to "Rigging" --- indra/newview/llfloatermodelpreview.cpp | 8 ++++---- indra/newview/skins/default/xui/en/floater_model_preview.xml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index f667116ca4..ff024e1d44 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -261,7 +261,7 @@ BOOL LLFloaterModelPreview::postBuild() mUploadLogText = getChild("log_text"); mTabContainer = getChild("import_tab"); - LLPanel *panel = mTabContainer->getPanelByName("avatar_panel"); + LLPanel *panel = mTabContainer->getPanelByName("rigging_panel"); mAvatarTabIndex = mTabContainer->getIndexForPanel(panel); panel->getChild("joints_list")->setCommitCallback(boost::bind(&LLFloaterModelPreview::onJointListSelection, this)); @@ -538,7 +538,7 @@ void populate_list_with_overrides(LLScrollListCtrl *listp, const LLJointOverride void LLFloaterModelPreview::onJointListSelection() { S32 display_lod = mModelPreview->mPreviewLOD; - LLPanel *panel = mTabContainer->getPanelByName("avatar_panel"); + LLPanel *panel = mTabContainer->getPanelByName("rigging_panel"); LLScrollListCtrl *joints_list = panel->getChild("joints_list"); LLScrollListCtrl *joints_pos = panel->getChild("pos_overrides_list"); LLScrollListCtrl *joints_scale = panel->getChild("scale_overrides_list"); @@ -1298,7 +1298,7 @@ void LLFloaterModelPreview::addStringToLog(const std::ostringstream& strm, bool void LLFloaterModelPreview::clearAvatarTab() { - LLPanel *panel = mTabContainer->getPanelByName("avatar_panel"); + LLPanel *panel = mTabContainer->getPanelByName("rigging_panel"); LLScrollListCtrl *joints_list = panel->getChild("joints_list"); joints_list->deleteAllItems(); LLScrollListCtrl *joints_pos = panel->getChild("pos_overrides_list"); @@ -1397,7 +1397,7 @@ void LLFloaterModelPreview::updateAvatarTab(bool highlight_overrides) } } - LLPanel *panel = mTabContainer->getPanelByName("avatar_panel"); + LLPanel *panel = mTabContainer->getPanelByName("rigging_panel"); LLScrollListCtrl *joints_list = panel->getChild("joints_list"); if (joints_list->isEmpty()) diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml index 66878f227b..4fa0b9af7d 100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -1173,8 +1173,8 @@ + name="rigging_panel" + title="Rigging">