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

SL-379 Do not disable tabs

master
Andrey Kleshchev 2020-03-30 15:14:44 +03:00
parent eaa9b152bf
commit 46c76eabb8
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/llfloatermodelpreview.cpp
View File

@ -407,13 +407,11 @@ BOOL LLFloaterModelPreview::postBuild()
// Disable Overrides tab untill it has something to show and set callbacks
LLPanel *panel = mTabContainer->getPanelByName("overrides_panel");
S32 index = mTabContainer->getIndexForPanel(panel);
mTabContainer->enableTabButton(index, false);
panel->getChild<LLScrollListCtrl>("joints_list")->setCommitCallback(boost::bind(&LLFloaterModelPreview::onJointListSelection, this));
// Disable Logs tab untill it has something to show
panel = mTabContainer->getPanelByName("logs_panel");
index = mTabContainer->getIndexForPanel(panel);
mTabContainer->enableTabButton(index, false);
if (LLConvexDecomposition::getInstance() != NULL)
{
@ -1459,7 +1457,7 @@ void LLFloaterModelPreview::resetOverridesTab()
}
}
void LLFloaterModelPreview::showOverridesTab()
void LLFloaterModelPreview::updateOverridesTab()
{
S32 display_lod = mModelPreview->mPreviewLOD;
if (mModelPreview->mModel[display_lod].empty())
@ -1504,8 +1502,6 @@ void LLFloaterModelPreview::showOverridesTab()
}
LLPanel *panel = mTabContainer->getPanelByName("overrides_panel");
S32 index = mTabContainer->getIndexForPanel(panel);
mTabContainer->enableTabButton(index, true);
LLScrollListCtrl *joints_list = panel->getChild<LLScrollListCtrl>("joints_list");
if (joints_list->isEmpty())
@ -1543,13 +1539,6 @@ void LLFloaterModelPreview::showOverridesTab()
}
}
void LLFloaterModelPreview::hideOverridesTab()
{
LLPanel *panel = mTabContainer->getPanelByName("overrides_panel");
S32 index = mTabContainer->getIndexForPanel(panel);
mTabContainer->enableTabButton(index, false);
}
//-----------------------------------------------------------------------------
// addStringToLogTab()
//-----------------------------------------------------------------------------
@ -1569,8 +1558,6 @@ void LLFloaterModelPreview::addStringToLogTab(const std::string& str, bool flash
}
LLPanel* panel = mTabContainer->getPanelByName("logs_panel");
S32 index = mTabContainer->getIndexForPanel(panel);
mTabContainer->enableTabButton(index, true);
// Make sure we have space for new string
S32 editor_text_len = mUploadLogText->getLength();
@ -2480,7 +2467,6 @@ void LLModelPreview::loadModelCallback(S32 loaded_lod)
else
{
fmp->resetOverridesTab();
fmp->hideOverridesTab();
}
if (lock_scale_if_joint_position)
@ -4231,7 +4217,7 @@ BOOL LLModelPreview::render()
mFMP->childEnable("lock_scale_if_joint_position");
if (fmp)
{
fmp->showOverridesTab();
fmp->updateOverridesTab();
}
}
else
@ -4240,7 +4226,7 @@ BOOL LLModelPreview::render()
mFMP->childSetValue("lock_scale_if_joint_position", false);
if (fmp)
{
fmp->hideOverridesTab();
fmp->resetOverridesTab();
}
}

3
indra/newview/llfloatermodelpreview.h
View File

@ -110,8 +110,7 @@ public:
static void addStringToLog(const std::ostringstream& strm, bool flash);
void clearOverridesTab(); // clears table
void resetOverridesTab(); // clears table and cleans all data
void showOverridesTab(); // populates table and data as nessesary
void hideOverridesTab();
void updateOverridesTab(); // populates table and data as nessesary
void setDetails(F32 x, F32 y, F32 z, F32 streaming_cost, F32 physics_cost);
void setPreviewLOD(S32 lod);