summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-05-18 11:33:28 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-05-18 11:33:28 -0400
commit3990324e8f8391aee335ad74b33b22e0b1c849af (patch)
tree3db4b6486f7c7d9abc1d5c17cc2c0c6f2e698aff
parent6f2e77522aded8c386edad8c4fb3a855272b3d3c (diff)
trying to fix mac build complaints
-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 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