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/llcommon/llliveappconfig.cpp | |
parent | ff42e557848158d5a01cc260bac0bbf974650934 (diff) | |
parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) |
merge with viewer tools update
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()) { |