summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-03-23 17:33:53 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-03-23 17:33:53 -0400
commite711e8af3d5f560fd93334d44eb7be1e01f02bec (patch)
tree84abc2c016c48af5af6e5f38f5070d64b0b83b33 /indra
parent89e09646824122e20194400e93bcdb0b212f96fe (diff)
SH-1168 WIP: Disable SLM save if MeshImportUseSLM not set
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llfloatermodelpreview.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 6145c6c16d..10f53dab01 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;