diff options
author | Northspring <pantera.polnocy@phoenixviewer.com> | 2015-04-23 22:43:05 +0200 |
---|---|---|
committer | Northspring <pantera.polnocy@phoenixviewer.com> | 2015-04-23 22:43:05 +0200 |
commit | 942d72ec36aa0e8be1d1aac35ab679463741b2d1 (patch) | |
tree | 02f84efaf0effaccc11e48c161a45f6693ec61c5 /indra/llcommon/llliveappconfig.cpp | |
parent | 2eb07a7080a85e9a63a6f5aff49907b386b865d2 (diff) | |
parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) |
Merge
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()) { |