summaryrefslogtreecommitdiff
path: root/indra/newview/lllogchat.cpp
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2011-05-13 13:58:40 -0700
committerDave SIMmONs <simon@lindenlab.com>2011-05-13 13:58:40 -0700
commit8a6965a3f94c0e56e0c2b17af329a6ac2c235735 (patch)
treeefa48644f44a7203c43f9cdbdc6a545108d72626 /indra/newview/lllogchat.cpp
parentff3289e2f3a8e87ce33cb267ad30b4a431406f9e (diff)
parente8ede07451c65aea898bc3f58a980b6b0d9af302 (diff)
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/lllogchat.cpp')
-rw-r--r--indra/newview/lllogchat.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index 2df683861a..efc4e23838 100644
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -32,6 +32,7 @@
#include "lltrans.h"
#include "llviewercontrol.h"
+#include "lldiriterator.h"
#include "llinstantmessage.h"
#include "llsingleton.h" // for LLSingleton
@@ -602,7 +603,8 @@ std::string LLLogChat::oldLogFileName(std::string filename)
//LL_INFOS("") << "Checking:" << directory << " for " << pattern << LL_ENDL;/* uncomment if you want to verify step, delete on commit */
std::vector<std::string> allfiles;
- while (gDirUtilp->getNextFileInDir(directory, pattern, scanResult))
+ LLDirIterator iter(directory, pattern);
+ while (iter.next(scanResult))
{
//LL_INFOS("") << "Found :" << scanResult << LL_ENDL;
allfiles.push_back(scanResult);