diff options
| author | Merov Linden <merov@lindenlab.com> | 2015-04-09 16:51:02 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2015-04-09 16:51:02 -0700 |
| commit | 8952e8177528fe0eee65916b9e12c3183f15e392 (patch) | |
| tree | 3625cecb6fd90bf0de23021c22b5d805527af131 /indra/llcommon/llliveappconfig.cpp | |
| parent | 47a3aecc97faa6ecb5267dde4274f0fe417e8409 (diff) | |
| parent | 6b9b4c91d122dccabf7541af70ed68a623ad8810 (diff) | |
Merge lindenlab/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..f955194009 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()); + std::ifstream file(filename().c_str()); LLSD config; if (file.is_open()) { |