diff options
| author | Rider Linden <none@none> | 2015-04-13 09:37:09 -0700 |
|---|---|---|
| committer | Rider Linden <none@none> | 2015-04-13 09:37:09 -0700 |
| commit | fe8dec32dbdd6085dd582c49134551638561ca0e (patch) | |
| tree | 8adf11b88185879911fca64825e73b95ff9db972 /indra/newview/llfeaturemanager.cpp | |
| parent | 2d3e4576d7a1f6d5f2a9c0596cefe3f62753b2fa (diff) | |
| parent | 5c6cf3e7fb9f592e3a293921175b64b515bac23f (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
| -rwxr-xr-x | indra/newview/llfeaturemanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index af84aea6a6..ea39f812fd 100755 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -331,7 +331,7 @@ bool LLFeatureManager::parseFeatureTable(std::string filename) U32 version; cleanupFeatureTables(); // in case an earlier attempt left partial results - file.open(filename); /*Flawfinder: ignore*/ + file.open(filename.c_str()); /*Flawfinder: ignore*/ if (!file) { |