diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-05 13:15:58 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-05 13:15:58 -0400 |
| commit | d8d1587d49e0fdc45c9f9d42f63870255dd36637 (patch) | |
| tree | 549205806e9cee829ac39077d411f928e1c69ecd /indra/newview/llfloatermodelpreview.cpp | |
| parent | d2fe45b8778ffbc67a2c6ec53704de6c95e7b0b3 (diff) | |
| parent | ec402fad16a937a39f4b5df4fd9da12acd61d322 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
| -rwxr-xr-x | indra/newview/llfloatermodelpreview.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 25b32258ca..6a12f4ce4f 100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -3514,7 +3514,18 @@ 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(); |