From ef73114ede629198258ee4830d0df8f96e5eb477 Mon Sep 17 00:00:00 2001
From: andreykproductengine <none@none>
Date: Thu, 17 Mar 2016 15:55:27 +0200
Subject: MAINT-6227 FIXED Crash on mesh upload
---
indra/newview/llfloatermodelpreview.cpp | 16 ++++++++++++----
indra/newview/llfloatermodelpreview.h | 1 +
2 files changed, 13 insertions(+), 4 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 57d69589d3..d94c91c16d 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()
{
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
index b2bb15ef05..a73ca50260 100755
--- a/indra/newview/llfloatermodelpreview.h
+++ b/indra/newview/llfloatermodelpreview.h
@@ -95,6 +95,7 @@ public:
static void setUploadAmount(S32 amount) { sUploadAmount = amount; }
void setDetails(F32 x, F32 y, F32 z, F32 streaming_cost, F32 physics_cost);
+ void setPreviewLOD(S32 lod);
void onBrowseLOD(S32 lod);
--
cgit v1.2.3