diff options
| author | andreykproductengine <none@none> | 2016-11-10 12:51:06 +0200 |
|---|---|---|
| committer | andreykproductengine <none@none> | 2016-11-10 12:51:06 +0200 |
| commit | b6e7708d608ee045a204758b2c259da1d4e826cc (patch) | |
| tree | d017f7aee0a427f8eb02204918a1776548010ab3 | |
| parent | 3d870a9c17d796bf4af68e3077e6dc51e284b3e0 (diff) | |
MAINT-6912 Specifying physics mesh was resetting previous model name
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llfloatermodelpreview.cpp | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 49a09a627f..2ea1db7e66 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -208,6 +208,7 @@ Ansariel Hiller MAINT-6911 MAINT-6917 STORM-2140 + MAINT-6912 Aralara Rajal Arare Chantilly CHUIBUG-191 diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 47d2c0e3c1..d29b96d245 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -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(); |