diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:22:37 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:22:37 -0500 |
| commit | bca2b9a053b1358435b57e0c7a59866702644844 (patch) | |
| tree | 017eff9fe68352e4dca6db8837b513b78dfa7f47 /indra/newview/lllogchat.cpp | |
| parent | ad555098bf599bbb9bdb4db945baef56674c0f2d (diff) | |
| parent | a426a4b65b4914c2469a0db1dbde4051b59c289b (diff) | |
merge changes for storm-832
Diffstat (limited to 'indra/newview/lllogchat.cpp')
| -rw-r--r-- | indra/newview/lllogchat.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp index b09cfbe907..9adf374c71 100644 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -32,7 +32,6 @@ #include "lltrans.h" #include "llviewercontrol.h" -#include "lldiriterator.h" #include "llinstantmessage.h" #include "llsingleton.h" // for LLSingleton @@ -602,8 +601,7 @@ 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; - LLDirIterator iter(directory, pattern); - while (iter.next(scanResult)) + while (gDirUtilp->getNextFileInDir(directory, pattern, scanResult)) { //LL_INFOS("") << "Found :" << scanResult << LL_ENDL; allfiles.push_back(scanResult); |