From eb6b75eb906bf91fbd824f75fc4dfed2b3718966 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 13 Jun 2011 18:46:51 -0400
Subject: [PATCH] SH-1796 FIX
---
indra/newview/app_settings/settings.xml | 4 ++--
indra/newview/llmeshrepository.cpp | 9 +++++----
2 files changed, 7 insertions(+), 6 deletions(-)
mode change 100644 => 100755 indra/newview/app_settings/settings.xml
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
old mode 100644
new mode 100755
index e323287084a..0386ef65c33
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5589,10 +5589,10 @@
<key>Value</key>
<real>0</real>
</map>
- <key>MeshUseWholeModelUpload</key>
+ <key>MeshUploadLogXML</key>
<map>
<key>Comment</key>
- <string>Upload model in its entirety instead of mesh-by-mesh (new caps)</string>
+ <string>Verbose XML logging on mesh upload</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 9855a641ed8..46732890945 100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -1424,10 +1424,11 @@ void LLMeshUploadThread::run()
void dumpLLSDToFile(const LLSD& content, std::string filename)
{
-#if 1
- std::ofstream of(filename.c_str());
- LLSDSerialize::toPrettyXML(content,of);
-#endif
+ if (gSavedSettings.getBOOL("MeshUploadLogXML"))
+ {
+ std::ofstream of(filename.c_str());
+ LLSDSerialize::toPrettyXML(content,of);
+ }
}
void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures)
--
GitLab