diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-04-24 10:08:13 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-04-24 10:08:13 -0400 |
commit | 76fb5f1542297a7e1afdf983d8a0db459fc0b8ab (patch) | |
tree | 0c35366715e4a944361f5ec1cbf61535b04b6ab0 /indra/newview/llcommandlineparser.cpp | |
parent | ff42e557848158d5a01cc260bac0bbf974650934 (diff) | |
parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) |
merge with viewer tools update
Diffstat (limited to 'indra/newview/llcommandlineparser.cpp')
-rwxr-xr-x | indra/newview/llcommandlineparser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llcommandlineparser.cpp b/indra/newview/llcommandlineparser.cpp index 06164e9597..1819fc74ee 100755 --- a/indra/newview/llcommandlineparser.cpp +++ b/indra/newview/llcommandlineparser.cpp @@ -622,7 +622,7 @@ void LLControlGroupCLP::configure(const std::string& config_filename, LLControlG LLSD clpConfigLLSD; llifstream input_stream; - input_stream.open(config_filename, std::ios::in | std::ios::binary); + input_stream.open(config_filename.c_str(), std::ios::in | std::ios::binary); if(input_stream.is_open()) { |