diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-15 07:27:50 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-15 07:27:50 -0500 |
| commit | 0cd40b4409b237093a771b28933ac2a33fa9f266 (patch) | |
| tree | 6aec2ccf66265722f4cb6f16774b54a7fa3eca49 /indra/newview/llwlparammanager.cpp | |
| parent | ef46e7037ca59224dfcdf3745e165ee97b086a69 (diff) | |
| parent | 5cbbb565f1bba870ec6db0b266e8768ecbdb7826 (diff) | |
merge fix for STORM-579
Diffstat (limited to 'indra/newview/llwlparammanager.cpp')
| -rw-r--r-- | indra/newview/llwlparammanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llwlparammanager.cpp b/indra/newview/llwlparammanager.cpp index 9b6047395a..e5f52dfc97 100644 --- a/indra/newview/llwlparammanager.cpp +++ b/indra/newview/llwlparammanager.cpp @@ -104,7 +104,7 @@ void LLWLParamManager::loadPresets(const std::string& file_name) while(found) { std::string name; - found = gDirUtilp->getNextFileInDir(path_name, "*.xml", name, false); + found = gDirUtilp->getNextFileInDir(path_name, "*.xml", name); if(found) { @@ -130,7 +130,7 @@ void LLWLParamManager::loadPresets(const std::string& file_name) while(found) { std::string name; - found = gDirUtilp->getNextFileInDir(path_name2, "*.xml", name, false); + found = gDirUtilp->getNextFileInDir(path_name2, "*.xml", name); if(found) { name=name.erase(name.length()-4); |