livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-13483 Rename Avatar tab to "Rigging"

meow-7.2.2
Andrey Kleshchev 2020-07-27 22:32:49 +03:00
parent b304895092
commit 0570d6d3c1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llfloatermodelpreview.cpp
View File

@ -261,7 +261,7 @@ BOOL LLFloaterModelPreview::postBuild()
mUploadLogText = getChild<LLViewerTextEditor>("log_text");
mTabContainer = getChild<LLTabContainer>("import_tab");
LLPanel *panel = mTabContainer->getPanelByName("avatar_panel");
LLPanel *panel = mTabContainer->getPanelByName("rigging_panel");
mAvatarTabIndex = mTabContainer->getIndexForPanel(panel);
panel->getChild<LLScrollListCtrl>("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<LLScrollListCtrl>("joints_list");
LLScrollListCtrl *joints_pos = panel->getChild<LLScrollListCtrl>("pos_overrides_list");
LLScrollListCtrl *joints_scale = panel->getChild<LLScrollListCtrl>("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<LLScrollListCtrl>("joints_list");
joints_list->deleteAllItems();
LLScrollListCtrl *joints_pos = panel->getChild<LLScrollListCtrl>("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<LLScrollListCtrl>("joints_list");
if (joints_list->isEmpty())

4
indra/newview/skins/default/xui/en/floater_model_preview.xml
View File

@ -1173,8 +1173,8 @@
<panel
label="Overrides"
layout="topleft"
name="avatar_panel"
title="Avatar">
name="rigging_panel"
title="Rigging">
<view_border
bevel_style="none"
follows="top|left"