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

FIRE-20309: Mesh model name in upload floater gets overwritten when selecting LOD/Physics file

meow-7.2.2
Ansariel 2016-11-04 11:00:44 +01:00
parent ea6dd43a30
commit 55494e1e05
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llfloatermodelpreview.cpp
View File

@ -2239,7 +2239,14 @@ void LLModelPreview::loadModelCallback(S32 loaded_lod)
if (!mBaseModel.empty())
{
const std::string& model_name = mBaseModel[0]->getName();
mFMP->getChild<LLUICtrl>("description_form")->setValue(model_name);
// <FS:Ansariel> FIRE-20309: Mesh model name gets overwritten when selecting LOD/Physics file
//mFMP->getChild<LLUICtrl>("description_form")->setValue(model_name);
LLLineEditor* description_form = mFMP->getChild<LLLineEditor>("description_form");
if (description_form->getText().empty())
{
description_form->setText(model_name);
}
// </FS:Ansariel>
}
}
refresh();