diff options
| author | nat_linden <nat@lindenlab.com> | 2015-04-15 10:50:46 -0400 |
|---|---|---|
| committer | nat_linden <nat@lindenlab.com> | 2015-04-15 10:50:46 -0400 |
| commit | 75396e1f131137d7f0dfb3f5fdbddeea1ce12fba (patch) | |
| tree | 33ca8281a889107816663e2bacfc44cfeeb9e815 /indra/newview/llcommandlineparser.cpp | |
| parent | e59dbf1b23a13c6a7f1f0d9661d3dcb78ea040f2 (diff) | |
| parent | e611e35e033e99f619b0e4938f6879c8e387efd5 (diff) | |
Merged lindenlab/viewer-tools-update into default
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()) { |