From 55494e1e0507a7a9b962249d7f068926e5345396 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 4 Nov 2016 11:00:44 +0100
Subject: [PATCH] FIRE-20309: Mesh model name in upload floater gets
 overwritten when selecting LOD/Physics file

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

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 19e5fca140..e7c299c416 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -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();