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

SL-98 - Remove special new tab-specific display behavior

master
Howard Stearns 2022-02-04 14:13:19 -08:00
parent f1df486208
commit ca43cc2305
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llfloatermodelpreview.cpp
View File

@ -270,7 +270,6 @@ BOOL LLFloaterModelPreview::postBuild()
LLPanel *panel = mTabContainer->getPanelByName("rigging_panel");
mAvatarTabIndex = mTabContainer->getIndexForPanel(panel);
panel->getChild<LLScrollListCtrl>("joints_list")->setCommitCallback(boost::bind(&LLFloaterModelPreview::onJointListSelection, this));
mPhysicsTabIndex = mTabContainer->getIndexForPanel(mTabContainer->getPanelByName("physics_panel"));
if (LLConvexDecomposition::getInstance() != NULL)
{

1
indra/newview/llfloatermodelpreview.h
View File

@ -231,7 +231,6 @@ private:
LLTabContainer* mTabContainer;
S32 mAvatarTabIndex; // just to avoid any issues in case of xml changes
S32 mPhysicsTabIndex;
std::string mSelectedJointName;
joint_override_data_map_t mJointOverrides[LLModel::NUM_LODS];

5
indra/newview/llmodelpreview.cpp
View File

@ -3404,10 +3404,7 @@ BOOL LLModelPreview::render()
{
gDebugProgram.bind();
}
if (fmp->mTabContainer->getCurrentPanelIndex() == fmp->mPhysicsTabIndex)
{ // Physics collision volumes obscure a lot, so only show them when on the physics tab.
getPreviewAvatar()->renderCollisionVolumes();
}
getPreviewAvatar()->renderCollisionVolumes();
if (fmp->mTabContainer->getCurrentPanelIndex() == fmp->mAvatarTabIndex)
{
getPreviewAvatar()->renderBones(fmp->mSelectedJointName);