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/llcommon/llliveappconfig.cpp | |
parent | e59dbf1b23a13c6a7f1f0d9661d3dcb78ea040f2 (diff) | |
parent | e611e35e033e99f619b0e4938f6879c8e387efd5 (diff) |
Merged lindenlab/viewer-tools-update into default
Diffstat (limited to 'indra/llcommon/llliveappconfig.cpp')
-rwxr-xr-x | indra/llcommon/llliveappconfig.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llliveappconfig.cpp b/indra/llcommon/llliveappconfig.cpp index 7c87c5a1a0..a9b1cdf4f6 100755 --- a/indra/llcommon/llliveappconfig.cpp +++ b/indra/llcommon/llliveappconfig.cpp @@ -49,7 +49,7 @@ bool LLLiveAppConfig::loadFile() { LL_INFOS() << "LLLiveAppConfig::loadFile(): reading from " << filename() << LL_ENDL; - llifstream file(filename()); + llifstream file(filename().c_str()); LLSD config; if (file.is_open()) { |