diff --git a/doc/contributions.txt b/doc/contributions.txt index 49a09a627fcceeb59be0e98532e048fae6bc656c..2ea1db7e66ad2cd7484fc741e1d5820b456f66d1 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 47d2c0e3c179ba10f4552065196db206a0a27228..d29b96d2453e7b44f561e703172b3f1aa383fdf5 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();