diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-06 17:31:36 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-05-06 17:31:36 +0300 |
| commit | b32d00308e4c3efee0c799f936155b58665ffc21 (patch) | |
| tree | 81d2aefb0303d48944f470a6fb6886ff0d497969 /indra/newview/llfloatermodelpreview.cpp | |
| parent | 76d1551e2ce53f8c26a8f5ced6c27c9a85e8a19f (diff) | |
| parent | 94559950a2c670990db56bd74e65d26652421b8c (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
| -rwxr-xr-x | indra/newview/llfloatermodelpreview.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index a6a9838a3c..576d6e890f 100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -338,25 +338,25 @@ BOOL LLFloaterModelPreview::postBuild() LLTextBox* text = getChild<LLTextBox>(lod_label_name[i]); if (text) { - text->setMouseDownCallback(boost::bind(&LLModelPreview::setPreviewLOD, mModelPreview, i)); + text->setMouseDownCallback(boost::bind(&LLFloaterModelPreview::setPreviewLOD, this, i)); } text = getChild<LLTextBox>(lod_triangles_name[i]); if (text) { - text->setMouseDownCallback(boost::bind(&LLModelPreview::setPreviewLOD, mModelPreview, i)); + text->setMouseDownCallback(boost::bind(&LLFloaterModelPreview::setPreviewLOD, this, i)); } text = getChild<LLTextBox>(lod_vertices_name[i]); if (text) { - text->setMouseDownCallback(boost::bind(&LLModelPreview::setPreviewLOD, mModelPreview, i)); + text->setMouseDownCallback(boost::bind(&LLFloaterModelPreview::setPreviewLOD, this, i)); } text = getChild<LLTextBox>(lod_status_name[i]); if (text) { - text->setMouseDownCallback(boost::bind(&LLModelPreview::setPreviewLOD, mModelPreview, i)); + text->setMouseDownCallback(boost::bind(&LLFloaterModelPreview::setPreviewLOD, this, i)); } } std::string current_grid = LLGridManager::getInstance()->getGridId(); @@ -1363,6 +1363,14 @@ void LLFloaterModelPreview::setDetails(F32 x, F32 y, F32 z, F32 streaming_cost, childSetTextArg("import_dimensions", "[Z]", llformat("%.3f", z)); } +void LLFloaterModelPreview::setPreviewLOD(S32 lod) +{ + if (mModelPreview) + { + mModelPreview->setPreviewLOD(lod); + } +} + void LLModelPreview::rebuildUploadData() { |