summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-06-16 17:00:12 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-06-16 17:00:12 -0400
commit6c5ae7f6ab3b844a135c6662a2f015eca684ab14 (patch)
tree4e45260654526affabb1095de9bb44c7ab5f4d45 /indra
parent8114464a729ef54b850a91f3677d78304e9c5648 (diff)
Fix for linux build failure, hopefully
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llmeshrepository.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 76079b2bf5..6e0722bcf9 100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -1455,7 +1455,7 @@ void dump_llsd_to_file(const LLSD& content, std::string filename)
LLSD llsd_from_file(std::string filename)
{
- std::ifstream ifs(filename);
+ std::ifstream ifs(filename.c_str());
LLSD result;
LLSDSerialize::fromXML(result,ifs);
return result;