From ca43cc2305502ec4f6a8d75ea2e4303b655ff0ce Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard.stearns@gmail.com>
Date: Fri, 4 Feb 2022 14:13:19 -0800
Subject: [PATCH] SL-98 - Remove special new tab-specific display behavior
---
indra/newview/llfloatermodelpreview.cpp | 1 -
indra/newview/llfloatermodelpreview.h | 1 -
indra/newview/llmodelpreview.cpp | 5 +----
3 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 165adf46440..64b24d54c3d 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -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)
{
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
index bb2b00351f7..8a01b0c3077 100644
--- a/indra/newview/llfloatermodelpreview.h
+++ b/indra/newview/llfloatermodelpreview.h
@@ -231,7 +231,6 @@ class LLFloaterModelPreview : public LLFloaterModelUploadBase
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];
diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp
index 8e487484fd4..f12ddb17455 100644
--- a/indra/newview/llmodelpreview.cpp
+++ b/indra/newview/llmodelpreview.cpp
@@ -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);
--
GitLab