diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-12 14:15:21 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-12 14:15:21 -0500 |
| commit | 4839e79b20679560f697af96c11db4aef7e1d740 (patch) | |
| tree | ea5faa6268fbe23de23ee03ee43d367181fba5c9 /indra/newview/llwlparammanager.cpp | |
| parent | 5b86f60a13f28f5978ff3a53371cb3bae7f0d837 (diff) | |
| parent | 2632565bbced3002eb9912270b1f7303c48a0b44 (diff) | |
merge STORM-102 to latest viewer-development prior to pull
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); |