diff options
| author | Seth ProductEngine <slitovchuk@productengine.com> | 2011-06-22 19:31:03 +0300 |
|---|---|---|
| committer | Seth ProductEngine <slitovchuk@productengine.com> | 2011-06-22 19:31:03 +0300 |
| commit | d625706d84cbb69d99497d3ee328105907867181 (patch) | |
| tree | 1242271caf985497e7fe299b88fe56dc40898063 /indra/newview/llfloatermodelpreview.cpp | |
| parent | e029683826623de6c112d6f50ead6e5d93cc98c9 (diff) | |
SH-1725 WIP Floater upload model wizard update:
- XUI changed according to latest mockups
- Added switching to advanced upload floater
- Added "Recalculate geometry" and "Recalculate physics" buttons
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
| -rw-r--r-- | indra/newview/llfloatermodelpreview.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 9721fc9224..06a1225905 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -544,6 +544,13 @@ void LLFloaterModelPreview::loadModel(S32 lod) (new LLMeshFilePicker(mModelPreview, lod))->getFile(); } +void LLFloaterModelPreview::loadModel(S32 lod, const std::string& file_name) +{ + mModelPreview->mLoading = true; + + mModelPreview->loadModel(file_name, lod); +} + //static void LLFloaterModelPreview::onImportScaleCommit(LLUICtrl*,void* userdata) { |