summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-05-13 12:01:39 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-05-13 12:01:39 -0400
commitd6fda15c34896db3b911c3719871ce317edaab1d (patch)
tree42c15713048e967fd0570e96d45bc44a2c908b98 /indra/newview
parent34d016ac476354c1313da6a0b5e07ee764343f8e (diff)
Fixed more build breakages due to persnickety compilers on mac/linux
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llmeshrepository.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 2ebe6cf6bd..2a68fbac8d 100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -1362,11 +1362,13 @@ void LLMeshUploadThread::run()
}
}
+#if 0
void dumpLLSDToFile(LLSD& content, std::string& filename)
{
std::ofstream of(filename);
LLSDSerialize::toPrettyXML(content,of);
}
+#endif
void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures)
{
@@ -1478,7 +1480,8 @@ void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures)
result["asset_resources"] = res;
#if 0
- dumpLLSDToFile(result,std::string("whole_model.xml"));
+ std::string name("whole_model.xml");
+ dumpLLSDToFile(result,name);
#endif
dest = result;