summaryrefslogtreecommitdiff
path: root/indra/newview/llwlparammanager.cpp
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2010-11-19 13:22:07 -0800
committerDave SIMmONs <simon@lindenlab.com>2010-11-19 13:22:07 -0800
commit2eec4949cc49f3c59cdc278be0e7eed1e092b167 (patch)
treec46a24bf021dccd724ba199bcf48a9b9b6ff0aca /indra/newview/llwlparammanager.cpp
parent9053aa7d1cb53445f7c7e8d929e3850807b52228 (diff)
parent1139584b026db86fd20364d0eb21b6e2351f8fb1 (diff)
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llwlparammanager.cpp')
-rw-r--r--indra/newview/llwlparammanager.cpp4
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);