SH-439 FIX: track name requested in UI separately, so we can fall back to name from dae if needed

2 files changed, 9 insertions, 2 deletions

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 7b71598b81..f763e9624f 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -2127,7 +2127,10 @@ void LLModelPreview::rebuildUploadData()
 	mTextureSet.clear();
 	
 	//fill uploaddata instance vectors from scene data
+
+	std::string requested_name = mFMP->getChild<LLUICtrl>("description_form")->getValue().asString();
 	
+
 	LLSpinCtrl* scale_spinner = mFMP->getChild<LLSpinCtrl>("import_scale");
 	
 	if (!scale_spinner)
@@ -2171,6 +2174,10 @@ void LLModelPreview::rebuildUploadData()
 			LLModelInstance instance = *model_iter;
 			
 			LLModel* base_model = instance.mModel;
+			if (base_model)
+			{
+				base_model->mRequestedLabel = requested_name;
+			}
 			
 			S32 idx = 0;
 			for (idx = 0; idx < mBaseModel.size(); ++idx)
@@ -4131,7 +4138,7 @@ void LLFloaterModelPreview::onBrowseLOD(void* data)
 void LLFloaterModelPreview::onUpload(void* user_data)
 {
 	LLFloaterModelPreview* mp = (LLFloaterModelPreview*) user_data;
-	
+
 	mp->mModelPreview->rebuildUploadData();
 	
 	gMeshRepo.uploadModel(mp->mModelPreview->mUploadData, mp->mModelPreview->mPreviewScale, 
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 0ee0d8393e..4873eaeabd 100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -2920,7 +2920,7 @@ LLSD LLMeshUploadThread::createObject(LLModelInstance& instance)
 	object_params["pos"] = ll_sd_from_vector3(position + mOrigin);
 	object_params["rotation"] = ll_sd_from_quaternion(quat_rotation);
 	object_params["scale"] = ll_sd_from_vector3(scale);
-	object_params["name"] = instance.mModel->mLabel;
+	object_params["name"] = instance.mModel->getName();
 
 	// load material from dae file
 	object_params["facelist"] = LLSD::emptyArray();