diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-09 15:18:51 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-09 15:18:51 -0500 |
| commit | eea9460ba5e18b081723a56d1d7d0bbf1f4edd85 (patch) | |
| tree | 064c76d04bd762387da065a6662972e8129f509a /indra/newview/llwlparammanager.cpp | |
| parent | b657516f72f016a918e0ff627105dd380a94394c (diff) | |
| parent | 669cf170ceae2609202fb948d388b7492f8eb90a (diff) | |
merge storm-102 branch back to default
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); |