diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-15 07:28:47 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-15 07:28:47 -0500 |
| commit | e08250d0874247c7c2c0acb025602e4299244d83 (patch) | |
| tree | d47e672dcd3d65f0d05cbce3e918f99195c35bb9 /indra/newview/llwlparammanager.cpp | |
| parent | b7afbcbc97ed06dd6845d3850633f2eda494940c (diff) | |
| parent | 0cd40b4409b237093a771b28933ac2a33fa9f266 (diff) | |
merge fix for STORM-578
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); |