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

MAINT-6912 Specifying physics mesh was resetting previous model name

master
andreykproductengine 2016-11-10 12:51:06 +02:00
parent 3d870a9c17
commit b6e7708d60
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -208,6 +208,7 @@ Ansariel Hiller
MAINT-6911
MAINT-6917
STORM-2140
MAINT-6912
Aralara Rajal
Arare Chantilly
CHUIBUG-191

6
indra/newview/llfloatermodelpreview.cpp
View File

@ -2122,7 +2122,11 @@ 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);
LLLineEditor* description_form = mFMP->getChild<LLLineEditor>("description_form");
if (description_form->getText().empty())
{
description_form->setText(model_name);
}
}
}
refresh();