diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-14 15:52:26 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-14 15:52:26 -0500 |
| commit | 5f8110a68ed2fdfe70e2dbd7363f1194b0f3e67d (patch) | |
| tree | a671f7f7a5e93a7fe63e200ede5467ecd26d8210 /indra/newview/llfloatermodelpreview.cpp | |
| parent | 4351160958efa1c352e8af1ab3f48c1486ba9c5c (diff) | |
SH-439 FIX: track name requested in UI separately, so we can fall back to name from dae if needed
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
| -rwxr-xr-x | indra/newview/llfloatermodelpreview.cpp | 9 |
1 files changed, 8 insertions, 1 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, |