diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-06-13 18:46:51 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-06-13 18:46:51 -0400 |
| commit | eb6b75eb906bf91fbd824f75fc4dfed2b3718966 (patch) | |
| tree | 0bfd424a74656dff6745969c106a213de1c77703 /indra/newview | |
| parent | 0b92d52d78772d6cc447a53fe12f01b31b2c371c (diff) | |
SH-1796 FIX
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/app_settings/settings.xml | 4 | ||||
| -rwxr-xr-x | indra/newview/llmeshrepository.cpp | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index e323287084..0386ef65c3 100644..100755 --- 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 9855a641ed..4673289094 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) |