summaryrefslogtreecommitdiff
path: root/indra/newview/llfeaturemanager.cpp
diff options
context:
space:
mode:
authornat_linden <nat@lindenlab.com>2015-04-15 10:50:46 -0400
committernat_linden <nat@lindenlab.com>2015-04-15 10:50:46 -0400
commit75396e1f131137d7f0dfb3f5fdbddeea1ce12fba (patch)
tree33ca8281a889107816663e2bacfc44cfeeb9e815 /indra/newview/llfeaturemanager.cpp
parente59dbf1b23a13c6a7f1f0d9661d3dcb78ea040f2 (diff)
parente611e35e033e99f619b0e4938f6879c8e387efd5 (diff)
Merged lindenlab/viewer-tools-update into default
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
-rwxr-xr-xindra/newview/llfeaturemanager.cpp2
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)
{