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

SL-304 [Mesh Uploader] A bit of cleanup (parse warnings, missing items, cleanup log)

master
andreykproductengine 2019-11-28 20:23:22 +02:00
parent 1840868178
commit 5c7b0dfe84
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llfloatermodelpreview.cpp
View File

@ -553,6 +553,8 @@ void LLFloaterModelPreview::loadModel(S32 lod, const std::string& file_name, boo
void LLFloaterModelPreview::onClickCalculateBtn()
{
clearLogTab();
mModelPreview->rebuildUploadData();
bool upload_skinweights = childGetValue("upload_skin").asBoolean();
@ -2410,7 +2412,6 @@ void LLModelPreview::loadModelCallback(S32 loaded_lod)
mLoading = false;
if (mFMP)
{
mFMP->getChild<LLCheckBoxCtrl>("confirm_checkbox")->set(FALSE);
if (!mBaseModel.empty())
{
const std::string& model_name = mBaseModel[0]->getName();
@ -4561,12 +4562,6 @@ void LLModelPreview::setPreviewLOD(S32 lod)
combo_box->setCurrentByIndex((NUM_LOD-1)-mPreviewLOD); // combo box list of lods is in reverse order
mFMP->childSetValue("lod_file_" + lod_name[mPreviewLOD], mLODFile[mPreviewLOD]);
LLComboBox* combo_box2 = mFMP->getChild<LLComboBox>("preview_lod_combo2");
combo_box2->setCurrentByIndex((NUM_LOD-1)-mPreviewLOD); // combo box list of lods is in reverse order
LLComboBox* combo_box3 = mFMP->getChild<LLComboBox>("preview_lod_combo3");
combo_box3->setCurrentByIndex((NUM_LOD-1)-mPreviewLOD); // combo box list of lods is in reverse order
LLColor4 highlight_color = LLUIColorTable::instance().getColor("MeshImportTableHighlightColor");
LLColor4 normal_color = LLUIColorTable::instance().getColor("MeshImportTableNormalColor");
@ -4596,8 +4591,10 @@ void LLFloaterModelPreview::onReset(void* user_data)
{
assert_main_thread();
LLFloaterModelPreview* fmp = (LLFloaterModelPreview*) user_data;
fmp->childDisable("reset_btn");
fmp->clearLogTab();
LLModelPreview* mp = fmp->mModelPreview;
std::string filename = mp->mLODFile[LLModel::LOD_HIGH];
@ -4616,6 +4613,7 @@ void LLFloaterModelPreview::onUpload(void* user_data)
assert_main_thread();
LLFloaterModelPreview* mp = (LLFloaterModelPreview*) user_data;
mp->clearLogTab();
mp->mUploadBtn->setEnabled(false);
@ -4808,6 +4806,13 @@ void LLFloaterModelPreview::resetUploadOptions()
getChild<LLComboBox>("Cosine%")->setCurrentByIndex(0);
}
void LLFloaterModelPreview::clearLogTab()
{
mUploadLogText->clear();
LLPanel* panel = mTabContainer->getPanelByName("logs_panel");
mTabContainer->setTabPanelFlashing(panel, false);
}
void LLFloaterModelPreview::onModelPhysicsFeeReceived(const LLSD& result, std::string upload_url)
{
mModelPhysicsFee = result;

1
indra/newview/llfloatermodelpreview.h
View File

@ -224,6 +224,7 @@ private:
void resetDisplayOptions();
void resetUploadOptions();
void clearLogTab();
void createSmoothComboBox(LLComboBox* combo_box, float min, float max);

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

@ -1548,7 +1548,6 @@ Analysed:
</panel>
<panel
follows="top|left|bottom|right"
can_resize="true"
name="right_panel"
top="0"
left="640"
@ -1565,7 +1564,6 @@ Analysed:
Preview:
</text>
<panel
can_resize="false"
follows="top|left"
height="20"
name="right_upper_panel"
@ -1574,7 +1572,6 @@ Analysed:
width="315">
<combo_box
top_pad="3"
can_resize="false"
follows="top|left"
height="18"
layout="topleft"
@ -1646,7 +1643,6 @@ Analysed:
layout="topleft"
left="2"
name="physics_explode_label"
bottom_pad="2"
width="150">
Preview Spread:
</text>