diff options
| author | Don Kjer <don@lindenlab.com> | 2011-07-03 01:02:01 -0700 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-07-03 01:02:01 -0700 |
| commit | ec402fad16a937a39f4b5df4fd9da12acd61d322 (patch) | |
| tree | eb09fad51d25854bf17af410f27e7dc6b107fbfe /indra/newview/llfloatermodelpreview.cpp | |
| parent | cae0915ee612dc1fe966c82ef764535f07f9a3ac (diff) | |
SH-1747 mesh-asset-dep -- uploaded objects have bad permissions, and SH-1975 Name of mesh is not loaded into mesh uploader floater. Also removed a lot of dead mesh uploader code.
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
| -rw-r--r-- | indra/newview/llfloatermodelpreview.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 67841620ea..14f8ccb625 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -3472,7 +3472,17 @@ void LLModelPreview::loadModelCallback(S32 lod) mLoading = false; if (mFMP) + { mFMP->getChild<LLCheckBoxCtrl>("confirm_checkbox")->set(FALSE); + if (!mBaseModel.empty()) + { + if (mFMP->getChild<LLUICtrl>("description_form")->getValue().asString().empty()) + { + const std::string& model_name = mBaseModel[0]->getName(); + mFMP->getChild<LLUICtrl>("description_form")->setValue(model_name); + } + } + } refresh(); mModelLoadedSignal(); |