summaryrefslogtreecommitdiff
path: root/indra/newview/llwaterparammanager.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-29 15:29:58 -0500
committerOz Linden <oz@lindenlab.com>2010-12-29 15:29:58 -0500
commite70ca1c391d0338b7a1cccd1d02e4532268e65f7 (patch)
treee6077ae3551d78d1d9b19900c406853e0afcf4d4 /indra/newview/llwaterparammanager.cpp
parentbf1d42ff96cbccff8f4a802b2c609fac15502365 (diff)
parent087c105317058dc3a011c937a5aceaf87fdecc26 (diff)
merge kdu unit tests (storm-744)
Diffstat (limited to 'indra/newview/llwaterparammanager.cpp')
-rw-r--r--indra/newview/llwaterparammanager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp
index 7314894c2e..d239347810 100644
--- a/indra/newview/llwaterparammanager.cpp
+++ b/indra/newview/llwaterparammanager.cpp
@@ -89,7 +89,7 @@ void LLWaterParamManager::loadAllPresets(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)
{
@@ -115,7 +115,7 @@ void LLWaterParamManager::loadAllPresets(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);