summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-05-09 17:30:40 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-05-09 17:30:40 -0400
commit49cadf47f3eeaee9da3fca55a321211456f86019 (patch)
tree9c25160baf0f16fe1dd064451c07023764befea3 /indra
parent0b677dd2198af4608435fd5c8d84cc4f77db47b8 (diff)
SH-1491 WIP - whole model upload for fee request
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llmeshrepository.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 9c72550847..c2c373d07f 100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -1365,7 +1365,7 @@ void LLMeshUploadThread::run()
void dumpLLSDToFile(LLSD& content, std::string& filename)
{
std::ofstream of(filename);
- LLSDSerialize::toXML(content,of);
+ LLSDSerialize::toPrettyXML(content,of);
}
LLSD LLMeshUploadThread::wholeModelToLLSD(bool include_textures)
@@ -1431,7 +1431,7 @@ LLSD LLMeshUploadThread::wholeModelToLLSD(bool include_textures)
mesh_entry["coords"]["rot_x"] = 1.0;
mesh_entry["coords"]["rot_y"] = 1.0;
mesh_entry["coords"]["rot_z"] = 1.0;
- mesh_entry["mesh_data"] = ostr.str();
+ mesh_entry["mesh_data"] = "RESTORE_ME"; //ostr.str();
res["mesh_list"][mesh_num] = mesh_entry;