From e711e8af3d5f560fd93334d44eb7be1e01f02bec Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 23 Mar 2011 17:33:53 -0400
Subject: [PATCH] SH-1168 WIP: Disable SLM save if MeshImportUseSLM not set
---
indra/newview/llfloatermodelpreview.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 6145c6c16d8..10f53dab019 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -2704,6 +2704,11 @@ void LLModelPreview::saveUploadData(bool save_skinweights, bool save_joint_posit
void LLModelPreview::saveUploadData(const std::string& filename, bool save_skinweights, bool save_joint_positions)
{
+ if (!gSavedSettings.getBOOL("MeshImportUseSLM"))
+ {
+ return;
+ }
+
std::set<LLPointer<LLModel> > meshes;
std::map<LLModel*, std::string> mesh_binary;
--
GitLab