diff options
| author | prep <prep@lindenlab.com> | 2011-05-18 15:56:41 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2011-05-18 15:56:41 -0400 |
| commit | 66554e2124dc87f61089bf96e2fe9ee5c32613d7 (patch) | |
| tree | 615b30a581d4bd76afd356922217c1a92bd70a8b | |
| parent | c84e84cfbf101deb0a920bd95b3a8a7b16806d04 (diff) | |
| parent | 3990324e8f8391aee335ad74b33b22e0b1c849af (diff) | |
merge
| -rwxr-xr-x | indra/newview/llmeshrepository.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 5305f3dbca..d9a58d56fe 100755 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -500,7 +500,7 @@ public: mThread->mPendingUploads--; dumpLLSDToFile(content,"whole_model_response.xml"); - mThread->mWholeModelUploadURL = content["uploader"]; + mThread->mWholeModelUploadURL = content["uploader"].asString(); } }; @@ -1389,7 +1389,7 @@ void LLMeshUploadThread::run() #if 1 void dumpLLSDToFile(const LLSD& content, std::string filename) { - std::ofstream of(filename); + std::ofstream of(filename.c_str()); LLSDSerialize::toPrettyXML(content,of); } #endif |