From 7cad431c6e4ea920a998ac1d3cdf385722fe5f7b Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 12 May 2011 10:17:08 -0400
Subject: [PATCH] small API change
---
indra/newview/llmeshrepository.cpp | 11 ++++++-----
indra/newview/llmeshrepository.h | 2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 9f302f9e57f..3163f4f1866 100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -1368,7 +1368,7 @@ void dumpLLSDToFile(LLSD& content, std::string& filename)
LLSDSerialize::toPrettyXML(content,of);
}
-LLSD LLMeshUploadThread::wholeModelToLLSD(bool include_textures)
+void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures)
{
// TODO where do textures go?
@@ -1470,11 +1470,11 @@ LLSD LLMeshUploadThread::wholeModelToLLSD(bool include_textures)
}
result["asset_resources"] = res;
-#if 0
+#if 1
dumpLLSDToFile(result,std::string("whole_model.xml"));
#endif
-
- return result;
+
+ dest = result;
}
void LLMeshUploadThread::doWholeModelUpload()
@@ -1525,7 +1525,8 @@ void LLMeshUploadThread::doWholeModelUpload()
}
bool do_include_textures = false; // not needed for initial cost/validation check.
- LLSD model_data = wholeModelToLLSD(do_include_textures);
+ LLSD model_data;
+ wholeModelToLLSD(model_data, do_include_textures);
mPendingUploads++;
LLCurlRequest::headers_t headers;
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h
index 9d8119dc48c..9460c0c0486 100755
--- a/indra/newview/llmeshrepository.h
+++ b/indra/newview/llmeshrepository.h
@@ -425,7 +425,7 @@ class LLMeshUploadThread : public LLThread
void doWholeModelUpload();
void doIterativeUpload();
- LLSD wholeModelToLLSD(bool include_textures);
+ void wholeModelToLLSD(LLSD& dest, bool include_textures);
};
class LLMeshRepository
--
GitLab