From b6e7708d608ee045a204758b2c259da1d4e826cc Mon Sep 17 00:00:00 2001
From: andreykproductengine <none@none>
Date: Thu, 10 Nov 2016 12:51:06 +0200
Subject: MAINT-6912 Specifying physics mesh was resetting previous model name

---
 indra/newview/llfloatermodelpreview.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

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();
-- 
cgit v1.2.3