Commits

VirLinden committed a19773f

small API change

Comments (0)

Files changed (2)

indra/newview/llmeshrepository.cpp

 	LLSDSerialize::toPrettyXML(content,of);
 }
 
-LLSD LLMeshUploadThread::wholeModelToLLSD(bool include_textures)
+void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures)
 {
 	// TODO where do textures go?
 	
 	}
 
 	result["asset_resources"] = res;
-#if 0	
+#if 1	
 	dumpLLSDToFile(result,std::string("whole_model.xml"));
 #endif
-	
-	return result;
+
+	dest = result;
 }
 
 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;

indra/newview/llmeshrepository.h

 	void doWholeModelUpload();
 	void doIterativeUpload();
 
-	LLSD wholeModelToLLSD(bool include_textures);
+	void wholeModelToLLSD(LLSD& dest, bool include_textures);
 };
 
 class LLMeshRepository